From: John W. Linville Date: Tue, 11 Oct 2011 19:33:10 +0000 (-0400) Subject: ath6kl: fixup merge damage in ath6kl_mgmt_tx X-Git-Tag: MMI-PSA29.97-13-9~18194^2~83^2~119 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5f68a2b0a890d086e40fc7b55f4a0c32c28bc0d2;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 --- 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;