Commit 505a2e88 authored by Arend Van Spriel's avatar Arend Van Spriel Committed by Johannes Berg
Browse files

nl80211: rework {sched_,}scan event related functions 



A couple of functions used with scan events were named with
term "send" although they were only preparing the the event
message so renamed those.

Also remove nl80211_send_sched_scan_results() in favor of
just calling nl80211_send_sched_scan() with the right value.

Signed-off-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
[mention nl80211_send_sched_scan_results() in the commit log]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent f6b4122c

net/wireless/nl80211.c

+8 −26
Original line number Diff line number Diff line
@@ -12804,7 +12804,7 @@ static int nl80211_add_scan_req(struct sk_buff *msg, 
	return -ENOBUFS;

}



static int nl80211_send_scan_msg(struct sk_buff *msg,

static int nl80211_prep_scan_msg(struct sk_buff *msg,

				 struct cfg80211_registered_device *rdev,

				 struct wireless_dev *wdev,

				 u32 portid, u32 seq, int flags,
@@ -12835,7 +12835,7 @@ static int nl80211_send_scan_msg(struct sk_buff *msg, 
}



static int

nl80211_send_sched_scan_msg(struct sk_buff *msg,

nl80211_prep_sched_scan_msg(struct sk_buff *msg,

			    struct cfg80211_registered_device *rdev,

			    struct net_device *netdev,

			    u32 portid, u32 seq, int flags, u32 cmd)
@@ -12867,7 +12867,7 @@ void nl80211_send_scan_start(struct cfg80211_registered_device *rdev, 
	if (!msg)

		return;



	if (nl80211_send_scan_msg(msg, rdev, wdev, 0, 0, 0,

	if (nl80211_prep_scan_msg(msg, rdev, wdev, 0, 0, 0,

				  NL80211_CMD_TRIGGER_SCAN) < 0) {

		nlmsg_free(msg);

		return;
@@ -12886,7 +12886,7 @@ struct sk_buff *nl80211_build_scan_msg(struct cfg80211_registered_device *rdev, 
	if (!msg)

		return NULL;



	if (nl80211_send_scan_msg(msg, rdev, wdev, 0, 0, 0,

	if (nl80211_prep_scan_msg(msg, rdev, wdev, 0, 0, 0,

				  aborted ? NL80211_CMD_SCAN_ABORTED :

					    NL80211_CMD_NEW_SCAN_RESULTS) < 0) {

		nlmsg_free(msg);
@@ -12896,7 +12896,8 @@ struct sk_buff *nl80211_build_scan_msg(struct cfg80211_registered_device *rdev, 
	return msg;

}



void nl80211_send_scan_result(struct cfg80211_registered_device *rdev,

/* send message created by nl80211_build_scan_msg() */

void nl80211_send_scan_msg(struct cfg80211_registered_device *rdev,

			   struct sk_buff *msg)

{

	if (!msg)
@@ -12906,25 +12907,6 @@ void nl80211_send_scan_result(struct cfg80211_registered_device *rdev, 
				NL80211_MCGRP_SCAN, GFP_KERNEL);

}



void nl80211_send_sched_scan_results(struct cfg80211_registered_device *rdev,

				     struct net_device *netdev)

{

	struct sk_buff *msg;



	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);

	if (!msg)

		return;



	if (nl80211_send_sched_scan_msg(msg, rdev, netdev, 0, 0, 0,

					NL80211_CMD_SCHED_SCAN_RESULTS) < 0) {

		nlmsg_free(msg);

		return;

	}



	genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,

				NL80211_MCGRP_SCAN, GFP_KERNEL);

}



void nl80211_send_sched_scan(struct cfg80211_registered_device *rdev,

			     struct net_device *netdev, u32 cmd)

{
@@ -12934,7 +12916,7 @@ void nl80211_send_sched_scan(struct cfg80211_registered_device *rdev, 
	if (!msg)

		return;



	if (nl80211_send_sched_scan_msg(msg, rdev, netdev, 0, 0, 0, cmd) < 0) {

	if (nl80211_prep_sched_scan_msg(msg, rdev, netdev, 0, 0, 0, cmd) < 0) {

		nlmsg_free(msg);

		return;

	}

net/wireless/nl80211.h

+2 −4
Original line number Diff line number Diff line
@@ -14,12 +14,10 @@ void nl80211_send_scan_start(struct cfg80211_registered_device *rdev, 
			     struct wireless_dev *wdev);

struct sk_buff *nl80211_build_scan_msg(struct cfg80211_registered_device *rdev,

				       struct wireless_dev *wdev, bool aborted);

void nl80211_send_scan_result(struct cfg80211_registered_device *rdev,

void nl80211_send_scan_msg(struct cfg80211_registered_device *rdev,

			   struct sk_buff *msg);

void nl80211_send_sched_scan(struct cfg80211_registered_device *rdev,

			     struct net_device *netdev, u32 cmd);

void nl80211_send_sched_scan_results(struct cfg80211_registered_device *rdev,

				     struct net_device *netdev);

void nl80211_common_reg_change_event(enum nl80211_commands cmd_id,

				     struct regulatory_request *request);

net/wireless/scan.c

+5 −4
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev, 
	ASSERT_RTNL();



	if (rdev->scan_msg) {

		nl80211_send_scan_result(rdev, rdev->scan_msg);

		nl80211_send_scan_msg(rdev, rdev->scan_msg);

		rdev->scan_msg = NULL;

		return;

	}
@@ -273,7 +273,7 @@ void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev, 
	if (!send_message)

		rdev->scan_msg = msg;

	else

		nl80211_send_scan_result(rdev, msg);

		nl80211_send_scan_msg(rdev, msg);

}



void __cfg80211_scan_done(struct work_struct *wk)
@@ -321,7 +321,8 @@ void __cfg80211_sched_scan_results(struct work_struct *wk) 
			spin_unlock_bh(&rdev->bss_lock);

			request->scan_start = jiffies;

		}

		nl80211_send_sched_scan_results(rdev, request->dev);

		nl80211_send_sched_scan(rdev, request->dev,

					NL80211_CMD_SCHED_SCAN_RESULTS);

	}



	rtnl_unlock();

CRA Git | Maintained and supported by SUSTech CRA and CCSE