ath6kl: fixup merge damage in ath6kl_mgmt_tx
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 11 Oct 2011 19:33:10 +0000 (15:33 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 11 Oct 2011 19:33:10 +0000 (15:33 -0400)
  CC [M]  drivers/net/wireless/ath/ath6kl/cfg80211.o
drivers/net/wireless/ath/ath6kl/cfg80211.c:1838:2: warning: initialization from incompatible pointer type

Caused by commit e9f935e3e8dc0bddd0df6d148165d95925422502...

Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath6kl/cfg80211.c

index 8d9fbd4a62b79771e8d6d3910f3f682ce3700e48..3aff36bad5d3a64194d08c312701ad26ae9a430d 100644 (file)
@@ -1732,7 +1732,7 @@ static int ath6kl_mgmt_tx(struct wiphy *wiphy, struct net_device *dev,
                          struct ieee80211_channel *chan, bool offchan,
                          enum nl80211_channel_type channel_type,
                          bool channel_type_valid, unsigned int wait,
-                         const u8 *buf, size_t len, u64 *cookie)
+                         const u8 *buf, size_t len, bool no_cck, u64 *cookie)
 {
        struct ath6kl *ar = ath6kl_priv(dev);
        u32 id;