diff options
author | Ivo van Doorn <ivdoorn@gmail.com> | 2008-01-11 14:53:07 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-01-16 12:53:32 -0500 |
commit | d101f6496d51cbeb285f531dff059ce0ef28ffe3 (patch) | |
tree | e3aea45a519a7606cf4b717ddfe815cd6644248a /drivers/net/wireless/rt2x00/rt2x00pci.c | |
parent | a38db5b6219d88e2b48f07472c436b19b864f93c (diff) |
rt2x00: Fix ieee80211 payload alignment
As Johannes Berg indicated, the NET_IP_ALIGN doesn't
need to be used for ieee80211 frames. This means we
can simplify the alignment calculation to just
use the result of the header size modulus 4 as frame
alignment.
Furthermore we shouldn't use NET_IP_ALIGN in rt2x00usb
because it could be 0 on some architectures and we absolutely
need to have 2 bytes reserved for possible aligning.
Signed-off-by: Ivo van Doorn<IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00pci.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c index 6d5d9aba0b73..04663eb31950 100644 --- a/drivers/net/wireless/rt2x00/rt2x00pci.c +++ b/drivers/net/wireless/rt2x00/rt2x00pci.c | |||
@@ -149,7 +149,7 @@ void rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev) | |||
149 | * The data behind the ieee80211 header must be | 149 | * The data behind the ieee80211 header must be |
150 | * aligned on a 4 byte boundary. | 150 | * aligned on a 4 byte boundary. |
151 | */ | 151 | */ |
152 | align = NET_IP_ALIGN + (2 * (header_size % 4 == 0)); | 152 | align = header_size % 4; |
153 | 153 | ||
154 | /* | 154 | /* |
155 | * Allocate the sk_buffer, initialize it and copy | 155 | * Allocate the sk_buffer, initialize it and copy |