diff options
| author | Juuso Oikarinen <juuso.oikarinen@nokia.com> | 2009-10-08 21:56:20 +0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-10-27 16:47:48 -0400 |
| commit | 1e2b79761d551c545225e1fa6e7d144f7e804898 (patch) | |
| tree | 58b3d7aa75e98abdb0b4a60dfba964c750deb7e6 /drivers/net/wireless/wl12xx/wl1271_main.c | |
| parent | ac4e4ce54eb9cb4963a1d3d91fc65536d882ffb2 (diff) | |
| download | lwn-1e2b79761d551c545225e1fa6e7d144f7e804898.tar.gz lwn-1e2b79761d551c545225e1fa6e7d144f7e804898.zip | |
wl1271: Correct TKIP header space handling in TX path
Correct the position to which TKIP header space is appended for TX
packets.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Vidhya Govindan <vidhya.govindan@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_main.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_main.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c index bedd19b57499..3d629daf2246 100644 --- a/drivers/net/wireless/wl12xx/wl1271_main.c +++ b/drivers/net/wireless/wl12xx/wl1271_main.c @@ -1160,12 +1160,9 @@ static int wl1271_register_hw(struct wl1271 *wl) static int wl1271_init_ieee80211(struct wl1271 *wl) { - /* - * The tx descriptor buffer and the TKIP space. - * - * FIXME: add correct 1271 descriptor size - */ - wl->hw->extra_tx_headroom = WL1271_TKIP_IV_SPACE; + /* The tx descriptor buffer and the TKIP space. */ + wl->hw->extra_tx_headroom = WL1271_TKIP_IV_SPACE + + sizeof(struct wl1271_tx_hw_descr); /* unit us */ /* FIXME: find a proper value */ |