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

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

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
parents d70f2cf5 e08fd975

Documentation/networking/regulatory.txt

+2 −2
Original line number Diff line number Diff line
@@ -159,10 +159,10 @@ struct ieee80211_regdomain mydriver_jp_regdom = { 
		REG_RULE(2412-20, 2484+20, 40, 6, 20, 0),

		/* IEEE 802.11a, channels 34..48 */

		REG_RULE(5170-20, 5240+20, 40, 6, 20,

			NL80211_RRF_PASSIVE_SCAN),

			NL80211_RRF_NO_IR),

		/* IEEE 802.11a, channels 52..64 */

		REG_RULE(5260-20, 5320+20, 40, 6, 20,

			NL80211_RRF_NO_IBSS |

			NL80211_RRF_NO_IR|

			NL80211_RRF_DFS),

	}

};

MAINTAINERS

+8 −11
Original line number Diff line number Diff line
@@ -1458,17 +1458,6 @@ T: git git://github.com/kvalo/ath.git 
S:	Supported

F:	drivers/net/wireless/ath/ath6kl/



ATHEROS ATH9K WIRELESS DRIVER

M:	"Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>

M:	Jouni Malinen <jouni@qca.qualcomm.com>

M:	Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>

M:	Senthil Balasubramanian <senthilb@qca.qualcomm.com>

L:	linux-wireless@vger.kernel.org

L:	ath9k-devel@lists.ath9k.org

W:	http://wireless.kernel.org/en/users/Drivers/ath9k

S:	Supported

F:	drivers/net/wireless/ath/ath9k/



WILOCITY WIL6210 WIRELESS DRIVER

M:	Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>

L:	linux-wireless@vger.kernel.org
@@ -6928,6 +6917,14 @@ T: git git://linuxtv.org/anttip/media_tree.git 
S:	Maintained

F:	drivers/media/tuners/qt1010*



QUALCOMM ATHEROS ATH9K WIRELESS DRIVER

M:	QCA ath9k Development <ath9k-devel@qca.qualcomm.com>

L:	linux-wireless@vger.kernel.org

L:	ath9k-devel@lists.ath9k.org

W:	http://wireless.kernel.org/en/users/Drivers/ath9k

S:	Supported

F:	drivers/net/wireless/ath/ath9k/



QUALCOMM ATHEROS ATH10K WIRELESS DRIVER

M:	Kalle Valo <kvalo@qca.qualcomm.com>

L:	ath10k@lists.infradead.org

drivers/bcma/host_pci.c

+0 −1
Original line number Diff line number Diff line
@@ -238,7 +238,6 @@ static void bcma_host_pci_remove(struct pci_dev *dev) 
	pci_release_regions(dev);

	pci_disable_device(dev);

	kfree(bus);

	pci_set_drvdata(dev, NULL);

}



#ifdef CONFIG_PM_SLEEP

drivers/net/wireless/ath/ath10k/mac.c

+2 −2
Original line number Diff line number Diff line
@@ -1351,12 +1351,12 @@ static int ath10k_update_channel_list(struct ath10k *ar) 
			ch->allow_vht = true;



			ch->allow_ibss =

				!(channel->flags & IEEE80211_CHAN_NO_IBSS);

				!(channel->flags & IEEE80211_CHAN_NO_IR);



			ch->ht40plus =

				!(channel->flags & IEEE80211_CHAN_NO_HT40PLUS);



			passive = channel->flags & IEEE80211_CHAN_PASSIVE_SCAN;

			passive = channel->flags & IEEE80211_CHAN_NO_IR;

			ch->passive = passive;



			ch->freq = channel->center_freq;

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

+8 −3
Original line number Diff line number Diff line
@@ -1109,7 +1109,9 @@ void ath6kl_cfg80211_ch_switch_notify(struct ath6kl_vif *vif, int freq, 
				(mode == WMI_11G_HT20) ?

					NL80211_CHAN_HT20 : NL80211_CHAN_NO_HT);



	mutex_lock(&vif->wdev.mtx);

	cfg80211_ch_switch_notify(vif->ndev, &chandef);

	mutex_unlock(&vif->wdev.mtx);

}



static int ath6kl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,
@@ -3169,12 +3171,15 @@ static bool ath6kl_is_p2p_go_ssid(const u8 *buf, size_t len) 
}



static int ath6kl_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,

			  struct ieee80211_channel *chan, bool offchan,

			  unsigned int wait, const u8 *buf, size_t len,

			  bool no_cck, bool dont_wait_for_ack, u64 *cookie)

			  struct cfg80211_mgmt_tx_params *params, u64 *cookie)

{

	struct ath6kl_vif *vif = ath6kl_vif_from_wdev(wdev);

	struct ath6kl *ar = ath6kl_priv(vif->ndev);

	struct ieee80211_channel *chan = params->chan;

	const u8 *buf = params->buf;

	size_t len = params->len;

	unsigned int wait = params->wait;

	bool no_cck = params->no_cck;

	u32 id, freq;

	const struct ieee80211_mgmt *mgmt;

	bool more_data, queued;