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

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

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

parents 41caa760 27b3eb9c

Documentation/DocBook/80211.tmpl

+1 −0
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@ 
          <title>functions/definitions</title>

!Finclude/net/mac80211.h ieee80211_rx_status

!Finclude/net/mac80211.h mac80211_rx_flags

!Finclude/net/mac80211.h mac80211_tx_info_flags

!Finclude/net/mac80211.h mac80211_tx_control_flags

!Finclude/net/mac80211.h mac80211_rate_control_flags

!Finclude/net/mac80211.h ieee80211_tx_rate

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

+2 −1
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ void ath6kl_tm_rx_event(struct ath6kl *ar, void *buf, size_t buf_len) 
	ath6kl_warn("nla_put failed on testmode rx skb!\n");

}



int ath6kl_tm_cmd(struct wiphy *wiphy, void *data, int len)

int ath6kl_tm_cmd(struct wiphy *wiphy, struct wireless_dev *wdev,

		  void *data, int len)

{

	struct ath6kl *ar = wiphy_priv(wiphy);

	struct nlattr *tb[ATH6KL_TM_ATTR_MAX + 1];

drivers/net/wireless/ath/ath6kl/testmode.h

+5 −2
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ 
#ifdef CONFIG_NL80211_TESTMODE



void ath6kl_tm_rx_event(struct ath6kl *ar, void *buf, size_t buf_len);

int ath6kl_tm_cmd(struct wiphy *wiphy, void *data, int len);

int ath6kl_tm_cmd(struct wiphy *wiphy, struct wireless_dev *wdev,

		  void *data, int len);



#else
@@ -29,7 +30,9 @@ static inline void ath6kl_tm_rx_event(struct ath6kl *ar, void *buf, 
{

}



static inline int ath6kl_tm_cmd(struct wiphy *wiphy, void *data, int len)

static inline int ath6kl_tm_cmd(struct wiphy *wiphy,

				struct wireless_dev *wdev,

				void *data, int len)

{

	return 0;

}

drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c

+3 −1
Original line number Diff line number Diff line
@@ -3155,7 +3155,9 @@ static int brcmf_cfg80211_sched_scan_stop(struct wiphy *wiphy, 
}



#ifdef CONFIG_NL80211_TESTMODE

static int brcmf_cfg80211_testmode(struct wiphy *wiphy, void *data, int len)

static int brcmf_cfg80211_testmode(struct wiphy *wiphy,

				   struct wireless_dev *wdev,

				   void *data, int len)

{

	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);

	struct net_device *ndev = cfg_to_ndev(cfg);

drivers/net/wireless/iwlwifi/dvm/tx.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static void iwlagn_tx_cmd_build_basic(struct iwl_priv *priv, 
		 priv->lib->bt_params->advanced_bt_coexist &&

		 (ieee80211_is_auth(fc) || ieee80211_is_assoc_req(fc) ||

		 ieee80211_is_reassoc_req(fc) ||

		 skb->protocol == cpu_to_be16(ETH_P_PAE)))

		 info->control.flags & IEEE80211_TX_CTRL_PORT_CTRL_PROTO))

		tx_flags |= TX_CMD_FLG_IGNORE_BT;