Re: [PATCH 2/3] usbnet: Add stop function pointer to 'struct rndis_data'.

[David Brownell <david-b@pacbell.net>]

On Tuesday 16 June 2009, Jussi Kivilinna wrote:
> 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>

Acked-by: 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 *);
>  
> 
>