wl1271: Correct TKIP header space handling in TX path

[linux-2.6.git] / drivers / net / wireless / wl12xx / wl1271_main.c

diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index bedd19b574990092243462efc304cfa661fccf99..3d629daf224628001a2d196de17f005e32214819 100644 (file)
--- 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 */