wl12xx: fix warning due to missing arg in ampdu_action
authorLuciano Coelho <coelho@ti.com>
Mon, 31 Jan 2011 07:41:52 +0000 (09:41 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 31 Jan 2011 20:11:38 +0000 (15:11 -0500)
Commit 0b01f030d38e00650e2db42da083d8647aad40a5 added a new argument
to the ampdu_action operation.  The ampdu_action operation in the
wl12xx driver currently doesn't have that argument and this generates
a warning.  This happened during merging of the latest mac80211
patches with the wl12xx BA patches.

  CC [M]  drivers/net/wireless/wl12xx/main.o
drivers/net/wireless/wl12xx/main.c:3035: warning: initialization from incompatible pointer type

The wl12xx driver doesn't need to do anything about the buf_size
argument since the AMPDU TX is fully handled by the firmware.

Signed-off-by: Luciano Coelho <coelho@ti.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/wl12xx/main.c

index dfab21e2e5dcd73c4550e33c32b0f5e46bd2c021..254b7daccee11f3253ca03cd894b00bad2aa4ebe 100644 (file)
@@ -2724,8 +2724,9 @@ out:
 }
 
 int wl1271_op_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
-                           enum ieee80211_ampdu_mlme_action action,
-                           struct ieee80211_sta *sta, u16 tid, u16 *ssn)
+                          enum ieee80211_ampdu_mlme_action action,
+                          struct ieee80211_sta *sta, u16 tid, u16 *ssn,
+                          u8 buf_size)
 {
        struct wl1271 *wl = hw->priv;
        int ret;