Merge "cfg80211: Add support for aborting an ongoing scan" (b9897566) · Commits · e / devices / android_kernel_sony_msm8998

include/net/cfg80211.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -2336,6 +2336,8 @@ struct cfg80211_qos_map {
		* the driver, and will be valid until passed to cfg80211_scan_done().
		* For scan results, call cfg80211_inform_bss(); you can call this outside
		* the scan/scan_done bracket too.
		* @abort_scan: Tell the driver to abort an ongoing scan. The driver shall
		* indicate the status of the scan through cfg80211_scan_done().
		*
		* @auth: Request to authenticate with the specified peer
		* (invoked with the wireless_dev mutex held)
		@@ -2608,6 +2610,7 @@ struct cfg80211_ops {

		int (scan)(struct wiphy wiphy,
		struct cfg80211_scan_request *request);
		void (abort_scan)(struct wiphy wiphy, struct wireless_dev *wdev);

		int (auth)(struct wiphy wiphy, struct net_device *dev,
		struct cfg80211_auth_request *req);

+6 −0

Original line number	Diff line number	Diff line
		@@ -822,6 +822,10 @@
		* as an event to indicate changes for devices with wiphy-specific regdom
		* management.
		*
		* @NL80211_CMD_ABORT_SCAN: Stop an ongoing scan. Returns -ENOENT if a scan is
		* not running. The driver indicates the status of the scan through
		* cfg80211_scan_done().
		*
		* @NL80211_CMD_MAX: highest used command number
		* @__NL80211_CMD_AFTER_LAST: internal use
		*/
		@@ -1008,6 +1012,8 @@ enum nl80211_commands {

		NL80211_CMD_WIPHY_REG_CHANGE,

		NL80211_CMD_ABORT_SCAN,

		/* add new commands above here */

		/* used to define NL80211_CMD_MAX below */

+26 −0

Original line number	Diff line number	Diff line
		@@ -6459,6 +6459,24 @@ out_free:
		return ERR_PTR(err);
		}

		static int nl80211_abort_scan(struct sk_buff skb, struct genl_info info)
		{
		struct cfg80211_registered_device *rdev = info->user_ptr[0];
		struct wireless_dev *wdev = info->user_ptr[1];

		if (!rdev->ops->abort_scan)
		return -EOPNOTSUPP;

		if (rdev->scan_msg)
		return 0;

		if (!rdev->scan_req)
		return -ENOENT;

		rdev_abort_scan(rdev, wdev);
		return 0;
		}

		static int nl80211_start_sched_scan(struct sk_buff *skb,
		struct genl_info *info)
		{
		@@ -11013,6 +11031,14 @@ static const struct genl_ops nl80211_ops[] = {
		.internal_flags = NL80211_FLAG_NEED_WDEV_UP \|
		NL80211_FLAG_NEED_RTNL,
		},
		{
		.cmd = NL80211_CMD_ABORT_SCAN,
		.doit = nl80211_abort_scan,
		.policy = nl80211_policy,
		.flags = GENL_ADMIN_PERM,
		.internal_flags = NL80211_FLAG_NEED_WDEV_UP \|
		NL80211_FLAG_NEED_RTNL,
		},
		{
		.cmd = NL80211_CMD_GET_SCAN,
		.policy = nl80211_policy,

+8 −0

Original line number	Diff line number	Diff line
		@@ -426,6 +426,14 @@ static inline int rdev_scan(struct cfg80211_registered_device *rdev,
		return ret;
		}

		static inline void rdev_abort_scan(struct cfg80211_registered_device *rdev,
		struct wireless_dev *wdev)
		{
		trace_rdev_abort_scan(&rdev->wiphy, wdev);
		rdev->ops->abort_scan(&rdev->wiphy, wdev);
		trace_rdev_return_void(&rdev->wiphy);
		}

		static inline int rdev_auth(struct cfg80211_registered_device *rdev,
		struct net_device *dev,
		struct cfg80211_auth_request *req)

+4 −0

Original line number	Diff line number	Diff line
		@@ -2805,6 +2805,10 @@ TRACE_EVENT(cfg80211_ft_event,
		WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(target_ap))
		);

		DEFINE_EVENT(wiphy_wdev_evt, rdev_abort_scan,
		TP_PROTO(struct wiphy wiphy, struct wireless_dev wdev),
		TP_ARGS(wiphy, wdev)
		);
		#endif /* !__RDEV_OPS_TRACE \|\| TRACE_HEADER_MULTI_READ */

		#undef TRACE_INCLUDE_PATH