mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-17 17:24:17 +08:00
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>
This commit is contained in:
parent
d6222fb0d6
commit
5f68a2b0a8
@ -1732,7 +1732,7 @@ static int ath6kl_mgmt_tx(struct wiphy *wiphy, struct net_device *dev,
|
|||||||
struct ieee80211_channel *chan, bool offchan,
|
struct ieee80211_channel *chan, bool offchan,
|
||||||
enum nl80211_channel_type channel_type,
|
enum nl80211_channel_type channel_type,
|
||||||
bool channel_type_valid, unsigned int wait,
|
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);
|
struct ath6kl *ar = ath6kl_priv(dev);
|
||||||
u32 id;
|
u32 id;
|
||||||
|
Loading…
Reference in New Issue
Block a user