diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-17 10:46:18 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-17 10:46:18 +0100 |
| commit | 9dacc71ff31a008d1e689fc824d31f6696454f68 (patch) | |
| tree | b792f9c30008e1ed469a73ead4339fdf8a50a5ce /drivers/net/wireless/hostap/hostap_wlan.h | |
| parent | 19f47c634ea8c5a10ff7bb1a08c52fd0f49bc54c (diff) | |
| parent | 9bf1a2445f3c569098b8de7097ca324e65abecc2 (diff) | |
Merge commit 'v2.6.28-rc5' into x86/cleanups
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_wlan.h')
| -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 ffdf4876121..a68f97c3935 100644 --- a/drivers/net/wireless/hostap/hostap_wlan.h +++ b/drivers/net/wireless/hostap/hostap_wlan.h @@ -918,9 +918,12 @@ struct hostap_interface { /* * TX meta data - stored in skb->cb buffer, so this must not be increased over - * the 40-byte limit + * the 48-byte limit. + * THE PADDING THIS STARTS WITH IS A HORRIBLE HACK THAT SHOULD NOT LIVE + * TO SEE THE DAY. */ struct hostap_skb_tx_data { + unsigned int __padding_for_default_qdiscs; u32 magic; /* HOSTAP_SKB_TX_DATA_MAGIC */ u8 rate; /* transmit rate */ #define HOSTAP_TX_FLAGS_WDS BIT(0) |