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

Commit 0440507b 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 8d242488 7f0d9f43

Documentation/feature-removal-schedule.txt

+13 −9
Original line number Diff line number Diff line
@@ -249,15 +249,6 @@ Who: Ravikiran Thirumalai <kiran@scalex86.org> 


---------------------------



What:	Code that is now under CONFIG_WIRELESS_EXT_SYSFS

	(in net/core/net-sysfs.c)

When:	3.5

Why:	Over 1K .text/.data size reduction, data is available in other

	ways (ioctls)

Who:	Johannes Berg <johannes@sipsolutions.net>



---------------------------



What:	sysfs ui for changing p4-clockmod parameters

When:	September 2009

Why:	See commits 129f8ae9b1b5be94517da76009ea956e89104ce8 and
@@ -434,6 +425,19 @@ Who: Hans Verkuil <hans.verkuil@cisco.com> 


----------------------------



What:	CONFIG_CFG80211_WEXT

When:	as soon as distributions ship new wireless tools, ie. wpa_supplicant 1.0

	and NetworkManager/connman/etc. that are able to use nl80211

Why:	Wireless extensions are deprecated, and userland tools are moving to

	using nl80211. New drivers are no longer using wireless extensions,

	and while there might still be old drivers, both new drivers and new

	userland no longer needs them and they can't be used for an feature

	developed in the past couple of years. As such, compatibility with

	wireless extensions in new drivers will be removed.

Who:	Johannes Berg <johannes@sipsolutions.net>



----------------------------



What:	g_file_storage driver

When:	3.8

Why:	This driver has been superseded by g_mass_storage.

MAINTAINERS

+9 −9
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ F: drivers/hwmon/adm1029.c 


ADM8211 WIRELESS DRIVER

L:	linux-wireless@vger.kernel.org

W:	http://linuxwireless.org/

W:	http://wireless.kernel.org/

S:	Orphan

F:	drivers/net/wireless/adm8211.*
@@ -1423,7 +1423,7 @@ B43 WIRELESS DRIVER 
M:	Stefano Brivio <stefano.brivio@polimi.it>

L:	linux-wireless@vger.kernel.org

L:	b43-dev@lists.infradead.org

W:	http://linuxwireless.org/en/users/Drivers/b43

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

S:	Maintained

F:	drivers/net/wireless/b43/
@@ -1432,7 +1432,7 @@ M: Larry Finger <Larry.Finger@lwfinger.net> 
M:	Stefano Brivio <stefano.brivio@polimi.it>

L:	linux-wireless@vger.kernel.org

L:	b43-dev@lists.infradead.org

W:	http://linuxwireless.org/en/users/Drivers/b43

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

S:	Maintained

F:	drivers/net/wireless/b43legacy/
@@ -4339,7 +4339,7 @@ F: arch/m68k/hp300/ 
MAC80211

M:	Johannes Berg <johannes@sipsolutions.net>

L:	linux-wireless@vger.kernel.org

W:	http://linuxwireless.org/

W:	http://wireless.kernel.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git

S:	Maintained

F:	Documentation/networking/mac80211-injection.txt
@@ -4350,7 +4350,7 @@ MAC80211 PID RATE CONTROL 
M:	Stefano Brivio <stefano.brivio@polimi.it>

M:	Mattias Nissler <mattias.nissler@gmx.de>

L:	linux-wireless@vger.kernel.org

W:	http://linuxwireless.org/en/developers/Documentation/mac80211/RateControl/PID

W:	http://wireless.kernel.org/en/developers/Documentation/mac80211/RateControl/PID

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git

S:	Maintained

F:	net/mac80211/rc80211_pid*
@@ -5027,7 +5027,7 @@ F: fs/ocfs2/ 


ORINOCO DRIVER

L:	linux-wireless@vger.kernel.org

W:	http://linuxwireless.org/en/users/Drivers/orinoco

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

W:	http://www.nongnu.org/orinoco/

S:	Orphan

F:	drivers/net/wireless/orinoco/
@@ -5729,7 +5729,7 @@ F: net/rose/ 
RTL8180 WIRELESS DRIVER

M:	"John W. Linville" <linville@tuxdriver.com>

L:	linux-wireless@vger.kernel.org

W:	http://linuxwireless.org/

W:	http://wireless.kernel.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git

S:	Maintained

F:	drivers/net/wireless/rtl818x/rtl8180/
@@ -5739,7 +5739,7 @@ M: Herton Ronaldo Krzesinski <herton@canonical.com> 
M:	Hin-Tak Leung <htl10@users.sourceforge.net>

M:	Larry Finger <Larry.Finger@lwfinger.net>

L:	linux-wireless@vger.kernel.org

W:	http://linuxwireless.org/

W:	http://wireless.kernel.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git

S:	Maintained

F:	drivers/net/wireless/rtl818x/rtl8187/
@@ -5748,7 +5748,7 @@ RTL8192CE WIRELESS DRIVER 
M:	Larry Finger <Larry.Finger@lwfinger.net>

M:	Chaoming Li <chaoming_li@realsil.com.cn>

L:	linux-wireless@vger.kernel.org

W:	http://linuxwireless.org/

W:	http://wireless.kernel.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git

S:	Maintained

F:	drivers/net/wireless/rtlwifi/

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

+3 −33
Original line number Diff line number Diff line
@@ -2585,35 +2585,6 @@ static int ath6kl_set_ies(struct ath6kl_vif *vif, 
	return 0;

}



static int ath6kl_set_channel(struct wiphy *wiphy, struct net_device *dev,

			      struct ieee80211_channel *chan,

			      enum nl80211_channel_type channel_type)

{

	struct ath6kl_vif *vif;



	/*

	 * 'dev' could be NULL if a channel change is required for the hardware

	 * device itself, instead of a particular VIF.

	 *

	 * FIXME: To be handled properly when monitor mode is supported.

	 */

	if (!dev)

		return -EBUSY;



	vif = netdev_priv(dev);



	if (!ath6kl_cfg80211_ready(vif))

		return -EIO;



	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: center_freq=%u hw_value=%u\n",

		   __func__, chan->center_freq, chan->hw_value);

	vif->next_chan = chan->center_freq;

	vif->next_ch_type = channel_type;

	vif->next_ch_band = chan->band;



	return 0;

}



static int ath6kl_get_rsn_capab(struct cfg80211_beacon_data *beacon,

				u8 *rsn_capab)

{
@@ -2791,7 +2762,7 @@ static int ath6kl_start_ap(struct wiphy *wiphy, struct net_device *dev, 
	p.ssid_len = vif->ssid_len;

	memcpy(p.ssid, vif->ssid, vif->ssid_len);

	p.dot11_auth_mode = vif->dot11_auth_mode;

	p.ch = cpu_to_le16(vif->next_chan);

	p.ch = cpu_to_le16(info->channel->center_freq);



	/* Enable uAPSD support by default */

	res = ath6kl_wmi_ap_set_apsd(ar->wmi, vif->fw_vif_idx, true);
@@ -2815,8 +2786,8 @@ static int ath6kl_start_ap(struct wiphy *wiphy, struct net_device *dev, 
			return res;

	}



	if (ath6kl_set_htcap(vif, vif->next_ch_band,

			     vif->next_ch_type != NL80211_CHAN_NO_HT))

	if (ath6kl_set_htcap(vif, info->channel->band,

			     info->channel_type != NL80211_CHAN_NO_HT))

		return -EIO;



	/*
@@ -3271,7 +3242,6 @@ static struct cfg80211_ops ath6kl_cfg80211_ops = { 
	.suspend = __ath6kl_cfg80211_suspend,

	.resume = __ath6kl_cfg80211_resume,

#endif

	.set_channel = ath6kl_set_channel,

	.start_ap = ath6kl_start_ap,

	.change_beacon = ath6kl_change_beacon,

	.stop_ap = ath6kl_stop_ap,

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

+0 −3
Original line number Diff line number Diff line
@@ -553,9 +553,6 @@ struct ath6kl_vif { 
	u32 last_cancel_roc_id;

	u32 send_action_id;

	bool probe_req_report;

	u16 next_chan;

	enum nl80211_channel_type next_ch_type;

	enum ieee80211_band next_ch_band;

	u16 assoc_bss_beacon_int;

	u16 listen_intvl_t;

	u16 bmiss_time_t;

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

+0 −1
Original line number Diff line number Diff line
@@ -598,7 +598,6 @@ static int ath6kl_commit_ch_switch(struct ath6kl_vif *vif, u16 channel) 


	struct ath6kl *ar = vif->ar;



	vif->next_chan = channel;

	vif->profile.ch = cpu_to_le16(channel);



	switch (vif->nw_type) {