diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-01-05 17:18:59 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-01-05 17:18:59 -0500 |
| commit | 4f9b2a7dea2bf1dd81f280aa5e8a40ed910d2f0a (patch) | |
| tree | 52046049957a87103a383869155f43461963f089 /drivers/net/wireless/rt2x00/rt2x00.h | |
| parent | f3f66b69c8ff08b46975d9e99c7ecb92a8b12eda (diff) | |
| parent | 7a4a77b7771164d61ce702a588067d1e1d66db7c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
net/mac80211/iface.c
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00.h')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h index b4c6e0a6d7e0..096da85a66fa 100644 --- a/drivers/net/wireless/rt2x00/rt2x00.h +++ b/drivers/net/wireless/rt2x00/rt2x00.h | |||
| @@ -119,6 +119,12 @@ | |||
| 119 | ( ((unsigned long)((__skb)->data + (__header))) & 3 ) | 119 | ( ((unsigned long)((__skb)->data + (__header))) & 3 ) |
| 120 | 120 | ||
| 121 | /* | 121 | /* |
| 122 | * Constants for extra TX headroom for alignment purposes. | ||
| 123 | */ | ||
| 124 | #define RT2X00_ALIGN_SIZE 4 /* Only whole frame needs alignment */ | ||
| 125 | #define RT2X00_L2PAD_SIZE 8 /* Both header & payload need alignment */ | ||
| 126 | |||
| 127 | /* | ||
| 122 | * Standard timing and size defines. | 128 | * Standard timing and size defines. |
| 123 | * These values should follow the ieee80211 specifications. | 129 | * These values should follow the ieee80211 specifications. |
| 124 | */ | 130 | */ |