summaryrefslogtreecommitdiff
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-10-11 15:33:10 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-10-11 15:33:10 -0400
commit5f68a2b0a890d086e40fc7b55f4a0c32c28bc0d2 (patch)
tree29c675e824f2346a8c81c88a6a2383d7ea96cd77 /drivers/net/wireless
parentd6222fb0d669307a49e2a96aad86c156a9bb9551 (diff)
downloadlinux-5f68a2b0a890d086e40fc7b55f4a0c32c28bc0d2.tar.gz
ath6kl: fixup merge damage in ath6kl_mgmt_tx
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>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/ath/ath6kl/cfg80211.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index 8d9fbd4a62b7..3aff36bad5d3 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -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;