Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f68a2b0 authored by John W. Linville's avatar John W. Linville
Browse files

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 e9f935e3...

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d6222fb0

drivers/net/wireless/ath/ath6kl/cfg80211.c

+1 −1
Original line number Diff line number Diff line
@@ -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;