From: Dan Williams <dcbw@redhat.com>
To: Johannes Berg <johannes@sipsolutions.net>
Cc: John Linville <linville@tuxdriver.com>,
Marcel Holtmann <marcel@holtmann.org>,
linux-wireless <linux-wireless@vger.kernel.org>
Subject: Re: [PATCH] cfg80211: issue netlink notification when scan starts
Date: Tue, 16 Jun 2009 15:22:57 -0400 [thread overview]
Message-ID: <1245180177.28992.6.camel@130.81.190.10.in-addr.arpa> (raw)
In-Reply-To: <1245175002.21287.3.camel@johannes.local>
On Tue, 2009-06-16 at 19:56 +0200, Johannes Berg wrote:
> To ease multiple apps working together smoothly,
> send a notification when a scan is started.
Yay. I like this. As long as we can guarantee that it will always be
followed by a scan-done message of course.
Dan
> Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
> ---
> net/wireless/nl80211.c | 39 ++++++++++++++++++++++++++++++---------
> net/wireless/nl80211.h | 2 ++
> net/wireless/scan.c | 3 ++-
> 3 files changed, 34 insertions(+), 10 deletions(-)
>
> --- wireless-testing.orig/net/wireless/nl80211.c 2009-06-16 18:49:13.000000000 +0200
> +++ wireless-testing/net/wireless/nl80211.c 2009-06-16 18:51:27.000000000 +0200
> @@ -2773,6 +2773,9 @@ static int nl80211_trigger_scan(struct s
> drv->scan_req = request;
> err = drv->ops->scan(&drv->wiphy, dev, request);
>
> + if (!err)
> + nl80211_send_scan_start(drv, dev);
> +
> out_free:
> if (err) {
> drv->scan_req = NULL;
> @@ -3599,11 +3602,11 @@ static int nl80211_add_scan_req(struct s
> return -ENOBUFS;
> }
>
> -static int nl80211_send_scan_donemsg(struct sk_buff *msg,
> - struct cfg80211_registered_device *rdev,
> - struct net_device *netdev,
> - u32 pid, u32 seq, int flags,
> - u32 cmd)
> +static int nl80211_send_scan_msg(struct sk_buff *msg,
> + struct cfg80211_registered_device *rdev,
> + struct net_device *netdev,
> + u32 pid, u32 seq, int flags,
> + u32 cmd)
> {
> void *hdr;
>
> @@ -3624,6 +3627,24 @@ static int nl80211_send_scan_donemsg(str
> return -EMSGSIZE;
> }
>
> +void nl80211_send_scan_start(struct cfg80211_registered_device *rdev,
> + struct net_device *netdev)
> +{
> + struct sk_buff *msg;
> +
> + msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
> + if (!msg)
> + return;
> +
> + if (nl80211_send_scan_msg(msg, rdev, netdev, 0, 0, 0,
> + NL80211_CMD_TRIGGER_SCAN) < 0) {
> + nlmsg_free(msg);
> + return;
> + }
> +
> + genlmsg_multicast(msg, 0, nl80211_scan_mcgrp.id, GFP_KERNEL);
> +}
> +
> void nl80211_send_scan_done(struct cfg80211_registered_device *rdev,
> struct net_device *netdev)
> {
> @@ -3633,8 +3654,8 @@ void nl80211_send_scan_done(struct cfg80
> if (!msg)
> return;
>
> - if (nl80211_send_scan_donemsg(msg, rdev, netdev, 0, 0, 0,
> - NL80211_CMD_NEW_SCAN_RESULTS) < 0) {
> + if (nl80211_send_scan_msg(msg, rdev, netdev, 0, 0, 0,
> + NL80211_CMD_NEW_SCAN_RESULTS) < 0) {
> nlmsg_free(msg);
> return;
> }
> @@ -3651,8 +3672,8 @@ void nl80211_send_scan_aborted(struct cf
> if (!msg)
> return;
>
> - if (nl80211_send_scan_donemsg(msg, rdev, netdev, 0, 0, 0,
> - NL80211_CMD_SCAN_ABORTED) < 0) {
> + if (nl80211_send_scan_msg(msg, rdev, netdev, 0, 0, 0,
> + NL80211_CMD_SCAN_ABORTED) < 0) {
> nlmsg_free(msg);
> return;
> }
> --- wireless-testing.orig/net/wireless/nl80211.h 2009-06-16 18:50:32.000000000 +0200
> +++ wireless-testing/net/wireless/nl80211.h 2009-06-16 18:50:53.000000000 +0200
> @@ -6,6 +6,8 @@
> extern int nl80211_init(void);
> extern void nl80211_exit(void);
> extern void nl80211_notify_dev_rename(struct cfg80211_registered_device *rdev);
> +extern void nl80211_send_scan_start(struct cfg80211_registered_device *rdev,
> + struct net_device *netdev);
> extern void nl80211_send_scan_done(struct cfg80211_registered_device *rdev,
> struct net_device *netdev);
> extern void nl80211_send_scan_aborted(struct cfg80211_registered_device *rdev,
> --- wireless-testing.orig/net/wireless/scan.c 2009-06-16 18:52:00.000000000 +0200
> +++ wireless-testing/net/wireless/scan.c 2009-06-16 18:52:13.000000000 +0200
> @@ -648,7 +648,8 @@ int cfg80211_wext_siwscan(struct net_dev
> if (err) {
> rdev->scan_req = NULL;
> kfree(creq);
> - }
> + } else
> + nl80211_send_scan_start(rdev, dev);
> out:
> cfg80211_put_dev(rdev);
> return err;
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2009-06-16 19:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-16 17:56 [PATCH] cfg80211: issue netlink notification when scan starts Johannes Berg
2009-06-16 19:22 ` Dan Williams [this message]
2009-06-16 19:28 ` Johannes Berg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1245180177.28992.6.camel@130.81.190.10.in-addr.arpa \
--to=dcbw@redhat.com \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=marcel@holtmann.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox