diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-19 02:38:23 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-19 02:38:23 -0500 |
| commit | 198d6ba4d7f48c94f990f4604f0b3d73925e0ded (patch) | |
| tree | 56bbdf8ba2553c23c8099da9344a8f1d1aba97ab /drivers/net/wireless/hostap | |
| parent | 9a57f7fabd383920585ed8b74eacd117c6551f2d (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/isdn/i4l/isdn_net.c
fs/cifs/connect.c
Diffstat (limited to 'drivers/net/wireless/hostap')
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_wlan.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/hostap/hostap_wlan.h b/drivers/net/wireless/hostap/hostap_wlan.h index 8431030b0e11..d2c7a56b8b59 100644 --- a/drivers/net/wireless/hostap/hostap_wlan.h +++ b/drivers/net/wireless/hostap/hostap_wlan.h | |||
| @@ -918,9 +918,12 @@ struct hostap_interface { | |||
| 918 | 918 | ||
| 919 | /* | 919 | /* |
| 920 | * TX meta data - stored in skb->cb buffer, so this must not be increased over | 920 | * TX meta data - stored in skb->cb buffer, so this must not be increased over |
| 921 | * the 40-byte limit | 921 | * the 48-byte limit. |
| 922 | * THE PADDING THIS STARTS WITH IS A HORRIBLE HACK THAT SHOULD NOT LIVE | ||
| 923 | * TO SEE THE DAY. | ||
| 922 | */ | 924 | */ |
| 923 | struct hostap_skb_tx_data { | 925 | struct hostap_skb_tx_data { |
| 926 | unsigned int __padding_for_default_qdiscs; | ||
| 924 | u32 magic; /* HOSTAP_SKB_TX_DATA_MAGIC */ | 927 | u32 magic; /* HOSTAP_SKB_TX_DATA_MAGIC */ |
| 925 | u8 rate; /* transmit rate */ | 928 | u8 rate; /* transmit rate */ |
| 926 | #define HOSTAP_TX_FLAGS_WDS BIT(0) | 929 | #define HOSTAP_TX_FLAGS_WDS BIT(0) |