From: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
To: linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org,
Jussi Kivilinna <jussi.kivilinna@mbnet.fi>,
David Brownell <dbrownell@users.sourceforge.net>
Subject: [PATCH 2/3] usbnet: Add stop function pointer to 'struct rndis_data'.
Date: Tue, 16 Jun 2009 17:17:27 +0300 [thread overview]
Message-ID: <20090616141727.23639.22861.stgit@fate.lan> (raw)
In-Reply-To: <20090616141721.23639.15379.stgit@fate.lan>
Allow minidriver to know that netdev has stopped. This is to let
wireless turn off radio when usbnet dev is stopped.
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
CC: David Brownell <dbrownell@users.sourceforge.net>
---
drivers/net/usb/usbnet.c | 14 ++++++++++++++
include/linux/usb/usbnet.h | 3 +++
2 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index f3a2fce..80251f0 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -544,7 +544,9 @@ EXPORT_SYMBOL_GPL(usbnet_unlink_rx_urbs);
int usbnet_stop (struct net_device *net)
{
struct usbnet *dev = netdev_priv(net);
+ struct driver_info *info = dev->driver_info;
int temp;
+ int retval;
DECLARE_WAIT_QUEUE_HEAD_ONSTACK (unlink_wakeup);
DECLARE_WAITQUEUE (wait, current);
@@ -556,6 +558,18 @@ int usbnet_stop (struct net_device *net)
dev->stats.rx_errors, dev->stats.tx_errors
);
+ /* allow minidriver to stop correctly (wireless devices to turn off
+ * radio etc) */
+ if (info->stop) {
+ retval = info->stop(dev);
+ if (retval < 0 && netif_msg_ifdown(dev))
+ devinfo(dev,
+ "stop fail (%d) usbnet usb-%s-%s, %s",
+ retval,
+ dev->udev->bus->bus_name, dev->udev->devpath,
+ info->description);
+ }
+
// ensure there are no more active urbs
add_wait_queue (&unlink_wakeup, &wait);
dev->wait = &unlink_wakeup;
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
index 36fabb9..e219fa2 100644
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
@@ -98,6 +98,9 @@ struct driver_info {
/* reset device ... can sleep */
int (*reset)(struct usbnet *);
+ /* stop device ... can sleep */
+ int (*stop)(struct usbnet *);
+
/* see if peer is connected ... can sleep */
int (*check_connect)(struct usbnet *);
next prev parent reply other threads:[~2009-06-16 14:26 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-16 14:17 [PATCH 1/3] rndis_wlan: convert get/set frag/rts to cfg80211 Jussi Kivilinna
2009-06-16 14:17 ` Jussi Kivilinna [this message]
2009-06-19 5:17 ` [PATCH 2/3] usbnet: Add stop function pointer to 'struct rndis_data' David Brownell
2009-06-19 7:15 ` David Miller
2009-06-16 14:17 ` [PATCH 3/3] rndis_wlan: convert set/get txpower to cfg80211 Jussi Kivilinna
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=20090616141727.23639.22861.stgit@fate.lan \
--to=jussi.kivilinna@mbnet.fi \
--cc=dbrownell@users.sourceforge.net \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/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