Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211 (e56108d9) · Commits · e / devices / android_kernel_teracube_emerald

net/core/net-sysfs.c

+20 −0

Original line number	Original line	Diff line number	Diff line
	@@ -429,6 +429,17 @@ static struct attribute_group netstat_group = {
	.name = "statistics",		.name = "statistics",
	.attrs = netstat_attrs,		.attrs = netstat_attrs,
	};		};

			#if IS_ENABLED(CONFIG_WIRELESS_EXT) \|\| IS_ENABLED(CONFIG_CFG80211)
			static struct attribute *wireless_attrs[] = {
			NULL
			};

			static struct attribute_group wireless_group = {
			.name = "wireless",
			.attrs = wireless_attrs,
			};
			#endif
	#endif /* CONFIG_SYSFS */		#endif /* CONFIG_SYSFS */

	#ifdef CONFIG_RPS		#ifdef CONFIG_RPS
	@@ -1409,6 +1420,15 @@ int netdev_register_kobject(struct net_device *net)
	groups++;		groups++;

	*groups++ = &netstat_group;		*groups++ = &netstat_group;

			#if IS_ENABLED(CONFIG_WIRELESS_EXT) \|\| IS_ENABLED(CONFIG_CFG80211)
			if (net->ieee80211_ptr)
			*groups++ = &wireless_group;
			#if IS_ENABLED(CONFIG_WIRELESS_EXT)
			else if (net->wireless_handlers)
			*groups++ = &wireless_group;
			#endif
			#endif
	#endif /* CONFIG_SYSFS */		#endif /* CONFIG_SYSFS */

	error = device_add(dev);		error = device_add(dev);

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1151,10 +1151,6 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata)

	mutex_lock(&sdata->u.ibss.mtx);		mutex_lock(&sdata->u.ibss.mtx);

	sdata->u.ibss.state = IEEE80211_IBSS_MLME_SEARCH;
	memset(sdata->u.ibss.bssid, 0, ETH_ALEN);
	sdata->u.ibss.ssid_len = 0;

	active_ibss = ieee80211_sta_active_ibss(sdata);		active_ibss = ieee80211_sta_active_ibss(sdata);

	if (!active_ibss && !is_zero_ether_addr(ifibss->bssid)) {		if (!active_ibss && !is_zero_ether_addr(ifibss->bssid)) {
	@@ -1175,6 +1171,10 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata)
	}		}
	}		}

			ifibss->state = IEEE80211_IBSS_MLME_SEARCH;
			memset(ifibss->bssid, 0, ETH_ALEN);
			ifibss->ssid_len = 0;

	sta_info_flush(sdata->local, sdata);		sta_info_flush(sdata->local, sdata);

	spin_lock_bh(&ifibss->incomplete_lock);		spin_lock_bh(&ifibss->incomplete_lock);