Merge "cfg80211: export interface stopping function" (c892e8fa) · Commits · e / devices / android_kernel_sony_msm8998

include/net/cfg80211.h

+15 −0

Original line number	Diff line number	Diff line
		@@ -5474,6 +5474,21 @@ int cfg80211_iter_combinations(struct wiphy *wiphy,
		void *data),
		void *data);

		/*
		* cfg80211_stop_iface - trigger interface disconnection
		*
		* @wiphy: the wiphy
		* @wdev: wireless device
		* @gfp: context flags
		*
		* Trigger interface to be stopped as if AP was stopped, IBSS/mesh left, STA
		* disconnected.
		*
		* Note: This doesn't need any locks and is asynchronous.
		*/
		void cfg80211_stop_iface(struct wiphy wiphy, struct wireless_dev wdev,
		gfp_t gfp);

		/**
		* cfg80211_shutdown_all_interfaces - shut down all interfaces for a wiphy
		* @wiphy: the wiphy to shut down

net/mac80211/pm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -132,7 +132,7 @@ int __ieee80211_suspend(struct ieee80211_hw hw, struct cfg80211_wowlan wowlan)
		IEEE80211_MAX_QUEUE_MAP,
		IEEE80211_QUEUE_STOP_REASON_SUSPEND,
		false);
		local->wowlan = false;
		return err;
		} else {
		goto suspend;
		}

net/wireless/ap.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@
		#include "rdev-ops.h"


		static int __cfg80211_stop_ap(struct cfg80211_registered_device *rdev,
		int __cfg80211_stop_ap(struct cfg80211_registered_device *rdev,
		struct net_device *dev, bool notify)
		{
		struct wireless_dev *wdev = dev->ieee80211_ptr;

net/wireless/core.c

+87 −34

Original line number	Diff line number	Diff line
		@@ -927,6 +927,92 @@ void cfg80211_update_iface_num(struct cfg80211_registered_device *rdev,
		rdev->num_running_monitor_ifaces += num;
		}

		void __cfg80211_leave(struct cfg80211_registered_device *rdev,
		struct wireless_dev *wdev)
		{
		struct net_device *dev = wdev->netdev;
		struct cfg80211_sched_scan_request *sched_scan_req;

		ASSERT_RTNL();
		ASSERT_WDEV_LOCK(wdev);

		switch (wdev->iftype) {
		case NL80211_IFTYPE_ADHOC:
		__cfg80211_leave_ibss(rdev, dev, true);
		break;
		case NL80211_IFTYPE_P2P_CLIENT:
		case NL80211_IFTYPE_STATION:
		sched_scan_req = rtnl_dereference(rdev->sched_scan_req);
		if (sched_scan_req && dev == sched_scan_req->dev)
		__cfg80211_stop_sched_scan(rdev, false);
		#ifdef CONFIG_CFG80211_WEXT
		kfree(wdev->wext.ie);
		wdev->wext.ie = NULL;
		wdev->wext.ie_len = 0;
		wdev->wext.connect.auth_type = NL80211_AUTHTYPE_AUTOMATIC;
		#endif
		cfg80211_disconnect(rdev, dev,
		WLAN_REASON_DEAUTH_LEAVING, true);
		cfg80211_mlme_down(rdev, dev);
		break;
		case NL80211_IFTYPE_MESH_POINT:
		__cfg80211_leave_mesh(rdev, dev);
		break;
		case NL80211_IFTYPE_AP:
		case NL80211_IFTYPE_P2P_GO:
		__cfg80211_stop_ap(rdev, dev, true);
		break;
		case NL80211_IFTYPE_OCB:
		__cfg80211_leave_ocb(rdev, dev);
		break;
		case NL80211_IFTYPE_WDS:
		/* must be handled by mac80211/driver, has no APIs */
		break;
		case NL80211_IFTYPE_P2P_DEVICE:
		/* cannot happen, has no netdev */
		break;
		case NL80211_IFTYPE_AP_VLAN:
		case NL80211_IFTYPE_MONITOR:
		/* nothing to do */
		break;
		case NL80211_IFTYPE_UNSPECIFIED:
		case NUM_NL80211_IFTYPES:
		/* invalid */
		break;
		}
		wdev->beacon_interval = 0;
		}

		void cfg80211_leave(struct cfg80211_registered_device *rdev,
		struct wireless_dev *wdev)
		{
		wdev_lock(wdev);
		__cfg80211_leave(rdev, wdev);
		wdev_unlock(wdev);
		}

		void cfg80211_stop_iface(struct wiphy wiphy, struct wireless_dev wdev,
		gfp_t gfp)
		{
		struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy);
		struct cfg80211_event *ev;
		unsigned long flags;

		trace_cfg80211_stop_iface(wiphy, wdev);

		ev = kzalloc(sizeof(*ev), gfp);
		if (!ev)
		return;

		ev->type = EVENT_STOPPED;

		spin_lock_irqsave(&wdev->event_lock, flags);
		list_add_tail(&ev->list, &wdev->event_list);
		spin_unlock_irqrestore(&wdev->event_lock, flags);
		queue_work(cfg80211_wq, &rdev->event_work);
		}
		EXPORT_SYMBOL(cfg80211_stop_iface);

		static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
		unsigned long state, void *ptr)
		{
		@@ -988,40 +1074,7 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
		dev->priv_flags \|= IFF_DONT_BRIDGE;
		break;
		case NETDEV_GOING_DOWN:
		switch (wdev->iftype) {
		case NL80211_IFTYPE_ADHOC:
		cfg80211_leave_ibss(rdev, dev, true);
		break;
		case NL80211_IFTYPE_P2P_CLIENT:
		case NL80211_IFTYPE_STATION:
		ASSERT_RTNL();
		sched_scan_req = rtnl_dereference(rdev->sched_scan_req);
		if (sched_scan_req && dev == sched_scan_req->dev)
		__cfg80211_stop_sched_scan(rdev, false);

		wdev_lock(wdev);
		#ifdef CONFIG_CFG80211_WEXT
		kfree(wdev->wext.ie);
		wdev->wext.ie = NULL;
		wdev->wext.ie_len = 0;
		wdev->wext.connect.auth_type =
		NL80211_AUTHTYPE_AUTOMATIC;
		#endif
		cfg80211_disconnect(rdev, dev,
		WLAN_REASON_DEAUTH_LEAVING, true);
		cfg80211_mlme_down(rdev, dev);
		wdev_unlock(wdev);
		break;
		case NL80211_IFTYPE_MESH_POINT:
		cfg80211_leave_mesh(rdev, dev);
		break;
		case NL80211_IFTYPE_AP:
		cfg80211_stop_ap(rdev, dev, false);
		break;
		default:
		break;
		}
		wdev->beacon_interval = 0;
		cfg80211_leave(rdev, wdev);
		break;
		case NETDEV_DOWN:
		cfg80211_update_iface_num(rdev, wdev->iftype, -1);

net/wireless/core.h

+10 −0

Original line number	Diff line number	Diff line
		@@ -199,6 +199,7 @@ enum cfg80211_event_type {
		EVENT_ROAMED,
		EVENT_DISCONNECTED,
		EVENT_IBSS_JOINED,
		EVENT_STOPPED,
		};

		struct cfg80211_event {
		@@ -297,6 +298,8 @@ int cfg80211_join_mesh(struct cfg80211_registered_device *rdev,
		struct net_device *dev,
		struct mesh_setup *setup,
		const struct mesh_config *conf);
		int __cfg80211_leave_mesh(struct cfg80211_registered_device *rdev,
		struct net_device *dev);
		int cfg80211_leave_mesh(struct cfg80211_registered_device *rdev,
		struct net_device *dev);
		int cfg80211_set_mesh_channel(struct cfg80211_registered_device *rdev,
		@@ -316,6 +319,8 @@ int cfg80211_leave_ocb(struct cfg80211_registered_device *rdev,
		struct net_device *dev);

		/* AP */
		int __cfg80211_stop_ap(struct cfg80211_registered_device *rdev,
		struct net_device *dev, bool notify);
		int cfg80211_stop_ap(struct cfg80211_registered_device *rdev,
		struct net_device *dev, bool notify);

		@@ -470,6 +475,11 @@ int cfg80211_validate_beacon_int(struct cfg80211_registered_device *rdev,
		void cfg80211_update_iface_num(struct cfg80211_registered_device *rdev,
		enum nl80211_iftype iftype, int num);

		void __cfg80211_leave(struct cfg80211_registered_device *rdev,
		struct wireless_dev *wdev);
		void cfg80211_leave(struct cfg80211_registered_device *rdev,
		struct wireless_dev *wdev);

		void cfg80211_stop_p2p_device(struct cfg80211_registered_device *rdev,
		struct wireless_dev *wdev);