From: Stephen Hemminger <shemminger@vyatta.com>
To: David Miller <davem@davemloft.net>, dbrownell@users.sourceforge.net
Cc: netdev@vger.kernel.org
Subject: [PATCH 27/77] usbnet: support net_device_ops
Date: Fri, 20 Mar 2009 22:35:54 -0700 [thread overview]
Message-ID: <20090321053714.584310988@vyatta.com> (raw)
In-Reply-To: 20090321053527.316395697@vyatta.com
[-- Attachment #1: usbnet-ops.patch --]
[-- Type: text/plain, Size: 4525 bytes --]
Use net_device_ops for usbnet device, and export for use
by other derived drivers.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
---
drivers/net/usb/usbnet.c | 31 +++++++++++++++++++++++--------
include/linux/usb/usbnet.h | 5 +++++
2 files changed, 28 insertions(+), 8 deletions(-)
--- a/drivers/net/usb/usbnet.c 2009-03-20 09:39:11.001839596 -0700
+++ b/drivers/net/usb/usbnet.c 2009-03-20 09:57:37.178776906 -0700
@@ -223,7 +223,7 @@ EXPORT_SYMBOL_GPL(usbnet_skb_return);
*
*-------------------------------------------------------------------------*/
-static int usbnet_change_mtu (struct net_device *net, int new_mtu)
+int usbnet_change_mtu (struct net_device *net, int new_mtu)
{
struct usbnet *dev = netdev_priv(net);
int ll_mtu = new_mtu + net->hard_header_len;
@@ -246,6 +246,7 @@ static int usbnet_change_mtu (struct net
return 0;
}
+EXPORT_SYMBOL_GPL(usbnet_change_mtu);
/*-------------------------------------------------------------------------*/
@@ -540,7 +541,7 @@ EXPORT_SYMBOL_GPL(usbnet_unlink_rx_urbs)
// precondition: never called in_interrupt
-static int usbnet_stop (struct net_device *net)
+int usbnet_stop (struct net_device *net)
{
struct usbnet *dev = netdev_priv(net);
int temp;
@@ -584,6 +585,7 @@ static int usbnet_stop (struct net_devic
return 0;
}
+EXPORT_SYMBOL_GPL(usbnet_stop);
/*-------------------------------------------------------------------------*/
@@ -591,7 +593,7 @@ static int usbnet_stop (struct net_devic
// precondition: never called in_interrupt
-static int usbnet_open (struct net_device *net)
+int usbnet_open (struct net_device *net)
{
struct usbnet *dev = netdev_priv(net);
int retval;
@@ -666,6 +668,7 @@ done:
done_nopm:
return retval;
}
+EXPORT_SYMBOL_GPL(usbnet_open);
/*-------------------------------------------------------------------------*/
@@ -900,7 +903,7 @@ static void tx_complete (struct urb *urb
/*-------------------------------------------------------------------------*/
-static void usbnet_tx_timeout (struct net_device *net)
+void usbnet_tx_timeout (struct net_device *net)
{
struct usbnet *dev = netdev_priv(net);
@@ -909,10 +912,11 @@ static void usbnet_tx_timeout (struct ne
// FIXME: device recovery -- reset?
}
+EXPORT_SYMBOL_GPL(usbnet_tx_timeout);
/*-------------------------------------------------------------------------*/
-static int usbnet_start_xmit (struct sk_buff *skb, struct net_device *net)
+int usbnet_start_xmit (struct sk_buff *skb, struct net_device *net)
{
struct usbnet *dev = netdev_priv(net);
int length;
@@ -995,7 +999,7 @@ drop:
}
return retval;
}
-
+EXPORT_SYMBOL_GPL(usbnet_start_xmit);
/*-------------------------------------------------------------------------*/
@@ -1102,6 +1106,15 @@ void usbnet_disconnect (struct usb_inter
}
EXPORT_SYMBOL_GPL(usbnet_disconnect);
+static const struct net_device_ops usbnet_netdev_ops = {
+ .ndo_open = usbnet_open,
+ .ndo_stop = usbnet_stop,
+ .ndo_start_xmit = usbnet_start_xmit,
+ .ndo_tx_timeout = usbnet_tx_timeout,
+ .ndo_change_mtu = usbnet_change_mtu,
+ .ndo_set_mac_address = eth_mac_addr,
+ .ndo_validate_addr = eth_validate_addr,
+};
/*-------------------------------------------------------------------------*/
@@ -1171,12 +1184,14 @@ usbnet_probe (struct usb_interface *udev
net->features |= NETIF_F_HIGHDMA;
#endif
- net->change_mtu = usbnet_change_mtu;
+ net->netdev_ops = &usbnet_netdev_ops;
+#ifdef CONFIG_COMPAT_NET_DEV_OPS
net->hard_start_xmit = usbnet_start_xmit;
net->open = usbnet_open;
net->stop = usbnet_stop;
- net->watchdog_timeo = TX_TIMEOUT_JIFFIES;
net->tx_timeout = usbnet_tx_timeout;
+#endif
+ net->watchdog_timeo = TX_TIMEOUT_JIFFIES;
net->ethtool_ops = &usbnet_ethtool_ops;
// allow device-specific bind/init procedures
--- a/include/linux/usb/usbnet.h 2009-03-20 09:54:30.657965414 -0700
+++ b/include/linux/usb/usbnet.h 2009-03-20 09:57:31.417699745 -0700
@@ -176,6 +176,11 @@ struct skb_data { /* skb->cb is one of t
size_t length;
};
+extern int usbnet_open (struct net_device *net);
+extern int usbnet_stop (struct net_device *net);
+extern int usbnet_start_xmit (struct sk_buff *skb, struct net_device *net);
+extern void usbnet_tx_timeout (struct net_device *net);
+extern int usbnet_change_mtu (struct net_device *net, int new_mtu);
extern int usbnet_get_endpoints(struct usbnet *, struct usb_interface *);
extern void usbnet_defer_kevent (struct usbnet *, int);
--
next prev parent reply other threads:[~2009-03-21 5:48 UTC|newest]
Thread overview: 197+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-21 5:35 [PATCH 00/77] Convert most of the rest of the devices to net_device_ops Stephen Hemminger
2009-03-21 5:35 ` [PATCH 01/77] atm: convert mpc device to using netdev_ops Stephen Hemminger
2009-03-21 11:44 ` Chas Williams (CONTRACTOR)
2009-03-22 2:34 ` David Miller
2009-03-21 5:35 ` [PATCH 02/77] atm: cconvert clip driver to net_device_ops Stephen Hemminger
2009-03-22 2:34 ` David Miller
2009-03-21 5:35 ` [ofa-general] [PATCH 03/77] infiniband: convert c2 " Stephen Hemminger
2009-03-21 18:26 ` [ofa-general] " Steve Wise
2009-03-22 2:34 ` David Miller
2009-03-22 16:12 ` [ofa-general] " Roland Dreier
2009-03-23 4:17 ` David Miller
2009-03-21 5:35 ` [ofa-general] [PATCH 04/77] infiniband: convert nes driver " Stephen Hemminger
2009-03-22 2:34 ` David Miller
2009-03-21 5:35 ` [ofa-general] [PATCH 05/77] infiniband: convert ipoib " Stephen Hemminger
2009-03-22 2:34 ` [ofa-general] " David Miller
2009-03-21 5:35 ` [PATCH 06/77] irda: net_device_ops ioctl fix Stephen Hemminger
2009-03-22 2:34 ` David Miller
2009-03-23 11:33 ` Samuel Ortiz
2009-03-23 11:33 ` Samuel Ortiz
2009-03-21 5:35 ` [PATCH 07/77] irlan: convert to net_device_ops Stephen Hemminger
2009-03-22 2:34 ` David Miller
2009-03-23 11:33 ` Samuel Ortiz
2009-03-21 5:35 ` [PATCH 08/77] irda: convert irda_usb " Stephen Hemminger
2009-03-22 2:34 ` David Miller
2009-03-23 11:34 ` Samuel Ortiz
2009-03-21 5:35 ` [PATCH 09/77] irda: convert mcs driver " Stephen Hemminger
2009-03-22 2:34 ` David Miller
2009-03-23 11:34 ` Samuel Ortiz
2009-03-21 5:35 ` [PATCH 10/77] stir4200: convert " Stephen Hemminger
2009-03-22 2:34 ` David Miller
2009-03-23 11:34 ` Samuel Ortiz
2009-03-21 5:35 ` [PATCH 11/77] irda: convert w83977af_ir " Stephen Hemminger
2009-03-22 2:36 ` David Miller
2009-03-23 11:35 ` Samuel Ortiz
2009-03-21 5:35 ` [PATCH 12/77] irda: convert nsc_ircc driver " Stephen Hemminger
2009-03-22 2:36 ` David Miller
2009-03-23 11:35 ` Samuel Ortiz
2009-03-21 5:35 ` [PATCH 13/77] irda: convert ali " Stephen Hemminger
2009-03-22 2:36 ` David Miller
2009-03-23 11:35 ` Samuel Ortiz
2009-03-21 5:35 ` [PATCH 14/77] irda: convert vlsi " Stephen Hemminger
2009-03-22 2:36 ` David Miller
2009-03-23 11:35 ` Samuel Ortiz
2009-03-21 5:35 ` [PATCH 15/77] irda: convert smsc " Stephen Hemminger
2009-03-22 2:36 ` David Miller
2009-03-23 11:36 ` Samuel Ortiz
2009-03-21 5:35 ` [PATCH 16/77] irda: convert via-ircc " Stephen Hemminger
2009-03-22 2:36 ` David Miller
2009-03-23 11:36 ` Samuel Ortiz
2009-03-21 5:35 ` [PATCH 17/77] irda: convert sir device " Stephen Hemminger
2009-03-22 2:36 ` David Miller
2009-03-23 11:36 ` Samuel Ortiz
2009-03-21 5:35 ` [PATCH 18/77] irda: convert kignsun " Stephen Hemminger
2009-03-22 2:37 ` David Miller
2009-03-23 11:37 ` Samuel Ortiz
2009-03-21 5:35 ` [PATCH 19/77] irda: convert ksdazzle " Stephen Hemminger
2009-03-22 2:37 ` David Miller
2009-03-23 11:37 ` Samuel Ortiz
2009-03-21 5:35 ` [PATCH 20/77] irda: convert ks959 " Stephen Hemminger
2009-03-22 2:37 ` David Miller
2009-03-23 11:37 ` Samuel Ortiz
2009-03-21 5:35 ` [PATCH 21/77] usbnet: convert catc to internal net_device_stats Stephen Hemminger
2009-03-22 2:45 ` David Miller
2009-03-21 5:35 ` [PATCH 22/77] usbnet: convert catc device to net_device_ops Stephen Hemminger
2009-03-21 9:01 ` David Brownell
2009-03-21 13:02 ` Vojtech Pavlik
2009-03-21 10:17 ` Jiri Pirko
2009-03-22 2:40 ` David Miller
2009-03-22 2:45 ` David Miller
2009-03-21 5:35 ` [PATCH 23/77] usbnet: convert to internal net_device stats Stephen Hemminger
2009-03-21 9:01 ` David Brownell
2009-03-21 13:02 ` Vojtech Pavlik
2009-03-22 2:45 ` David Miller
2009-03-21 5:35 ` [PATCH 24/77] usbnet: convert rtl driver to net_device_ops Stephen Hemminger
2009-03-21 9:03 ` David Brownell
2009-03-23 9:17 ` Petko Manolov
2009-03-22 2:45 ` David Miller
2009-03-21 5:35 ` [PATCH 25/77] usbnet: convert hso " Stephen Hemminger
2009-03-21 9:08 ` David Brownell
2009-03-22 2:45 ` David Miller
2009-03-21 5:35 ` [PATCH 26/77] usbnet: convert to internal net_device_stats Stephen Hemminger
2009-03-21 9:09 ` David Brownell
2009-03-22 2:46 ` David Miller
2009-03-21 5:35 ` Stephen Hemminger [this message]
2009-03-21 9:11 ` [PATCH 27/77] usbnet: support net_device_ops David Brownell
2009-03-22 2:46 ` David Miller
2009-03-21 5:35 ` [PATCH 28/77] usbnet: convert asix driver to net_device_ops Stephen Hemminger
2009-03-21 9:12 ` David Brownell
2009-03-22 2:46 ` David Miller
2009-03-21 5:35 ` [PATCH 29/77] usbnet: convert dms9601 " Stephen Hemminger
2009-03-21 9:14 ` David Brownell
2009-03-21 10:57 ` Peter Korsgaard
2009-03-21 11:28 ` Peter Korsgaard
2009-03-22 3:00 ` David Miller
2009-03-21 5:35 ` [PATCH 30/77] usbnet: convert msc7830 " Stephen Hemminger
2009-03-21 9:19 ` David Brownell
2009-03-22 3:00 ` David Miller
2009-03-21 5:35 ` [PATCH 31/77] usbnet: convert sms95xx " Stephen Hemminger
2009-03-21 9:20 ` David Brownell
2009-03-21 15:53 ` Steve.Glendinning
2009-03-22 3:01 ` David Miller
2009-03-21 5:35 ` [PATCH 32/77] usbnet: convert rndis driver to use dev_get_stats Stephen Hemminger
2009-03-21 9:22 ` David Brownell
2009-03-22 3:01 ` David Miller
2009-03-21 5:36 ` [PATCH 33/77] usbnet: convert rndis driver to net_device_ops Stephen Hemminger
2009-03-21 9:23 ` David Brownell
2009-03-22 3:01 ` David Miller
2009-03-21 5:36 ` [PATCH 34/77] pcmcia: convert 3c589 " Stephen Hemminger
2009-03-22 3:01 ` David Miller
2009-03-21 5:36 ` [PATCH 35/77] pcmcia: convert 3c574 " Stephen Hemminger
2009-03-22 3:01 ` David Miller
2009-03-21 5:36 ` [PATCH 36/77] pcmcia: convert fmvj18x driver to internal net_device_stats Stephen Hemminger
2009-03-22 3:01 ` David Miller
2009-03-21 5:36 ` [PATCH 37/77] pcmcia: convert fmvj18x driver to net_device_ops Stephen Hemminger
2009-03-22 3:01 ` David Miller
2009-03-21 5:36 ` [PATCH 38/77] pcmcia: convert nmclan " Stephen Hemminger
2009-03-22 3:01 ` David Miller
2009-03-21 5:36 ` [PATCH 39/77] pcnet: convert " Stephen Hemminger
2009-03-22 3:01 ` David Miller
2009-03-21 5:36 ` [PATCH 40/77] xir2cps: convert to internal net_device stats Stephen Hemminger
2009-03-22 3:02 ` David Miller
2009-03-21 5:36 ` [PATCH 41/77] xirc2ps: convert to net_device_ops Stephen Hemminger
2009-03-22 5:42 ` David Miller
2009-03-21 5:36 ` [PATCH 42/77] smc91c92: convert to internal net_device_stats Stephen Hemminger
2009-03-22 5:42 ` David Miller
2009-03-21 5:36 ` [PATCH 43/77] smc91c92: convert to net_device_ops Stephen Hemminger
2009-03-22 5:42 ` David Miller
2009-03-21 5:36 ` [PATCH 44/77] axnet: convert ot net_device_ops Stephen Hemminger
2009-03-22 5:42 ` David Miller
2009-03-21 5:36 ` [PATCH 45/77] x25_asy: convert to internal net_device_stats Stephen Hemminger
2009-03-22 5:42 ` David Miller
2009-03-21 5:36 ` [PATCH 46/77] x25_asy: convert to net_device_ops Stephen Hemminger
2009-03-22 5:43 ` David Miller
2009-03-21 5:36 ` [PATCH 47/77] dlci: convert to internal net_device_stats Stephen Hemminger
2009-03-22 5:43 ` David Miller
2009-03-21 5:36 ` [PATCH 48/77] dlci: convert to net_device_ops Stephen Hemminger
2009-03-22 5:43 ` David Miller
2009-03-21 5:36 ` [PATCH 49/77] cycx: " Stephen Hemminger
2009-03-22 5:43 ` David Miller
2009-03-21 5:36 ` [PATCH 50/77] lapbether: convert to internal net_device_stats Stephen Hemminger
2009-03-22 5:43 ` David Miller
2009-03-21 5:36 ` [PATCH 51/77] labether: convert to net_device_ops Stephen Hemminger
2009-03-22 5:47 ` David Miller
2009-03-21 5:36 ` [PATCH 52/77] sbni: use internal net_device_stats Stephen Hemminger
2009-03-22 5:47 ` David Miller
2009-03-21 5:36 ` [PATCH 53/77] sbni: convert to net_device_ops Stephen Hemminger
2009-03-22 5:47 ` David Miller
2009-03-21 5:36 ` [PATCH 54/77] netwave: convert to internal net_device_stats Stephen Hemminger
[not found] ` <20090321053716.656878050-ZtmgI6mnKB3QT0dZR+AlfA@public.gmane.org>
2009-03-22 5:47 ` David Miller
2009-03-21 5:36 ` [PATCH 55/77] netwave: convert to net_device_ops Stephen Hemminger
2009-03-22 5:48 ` David Miller
2009-03-21 5:36 ` [PATCH 56/77] strip: " Stephen Hemminger
2009-03-22 5:47 ` David Miller
2009-03-21 5:36 ` [PATCH 57/77] wavelan: convert to internal net_device_stats Stephen Hemminger
[not found] ` <20090321053716.884788530-ZtmgI6mnKB3QT0dZR+AlfA@public.gmane.org>
2009-03-22 5:47 ` David Miller
2009-03-21 5:36 ` [PATCH 58/77] wavelan: convert to net_device_ops Stephen Hemminger
2009-03-22 5:47 ` David Miller
2009-03-21 5:36 ` [PATCH 59/77] airo: " Stephen Hemminger
[not found] ` <20090321053717.048069302-ZtmgI6mnKB3QT0dZR+AlfA@public.gmane.org>
2009-03-22 5:48 ` David Miller
2009-03-21 5:36 ` [PATCH 60/77] atmel: " Stephen Hemminger
[not found] ` <20090321053717.126155878-ZtmgI6mnKB3QT0dZR+AlfA@public.gmane.org>
2009-03-22 5:48 ` David Miller
2009-03-21 5:36 ` [PATCH 61/77] raylan: " Stephen Hemminger
2009-03-22 5:53 ` David Miller
2009-03-21 5:36 ` [PATCH 62/77] wl3501: convert to internal net_device_stats Stephen Hemminger
2009-03-22 5:53 ` David Miller
2009-03-21 5:36 ` [PATCH 63/77] wl3501: convert to net_device_ops Stephen Hemminger
2009-03-22 5:53 ` David Miller
2009-03-21 5:36 ` [PATCH 64/77] zd1201: convert to internal net_device_stats Stephen Hemminger
[not found] ` <20090321053717.440414565-ZtmgI6mnKB3QT0dZR+AlfA@public.gmane.org>
2009-03-22 5:53 ` David Miller
2009-03-21 5:36 ` [PATCH 65/77] zd1201: convert to net_device_ops Stephen Hemminger
[not found] ` <20090321053717.514936473-ZtmgI6mnKB3QT0dZR+AlfA@public.gmane.org>
2009-03-22 5:53 ` David Miller
2009-03-21 5:36 ` [PATCH 66/77] mac80211_hwsim: convert to internal net_device_stats Stephen Hemminger
[not found] ` <20090321053717.601771143-ZtmgI6mnKB3QT0dZR+AlfA@public.gmane.org>
2009-03-21 11:08 ` Johannes Berg
2009-03-22 5:49 ` David Miller
2009-03-22 5:53 ` David Miller
2009-03-21 5:36 ` [PATCH 67/77] prism54: convert to net_device_ops Stephen Hemminger
[not found] ` <20090321053717.682860987-ZtmgI6mnKB3QT0dZR+AlfA@public.gmane.org>
2009-03-22 5:53 ` David Miller
2009-03-21 5:36 ` [PATCH 68/77] prism54: convert to internal net_device_stats Stephen Hemminger
2009-03-22 5:53 ` David Miller
2009-03-21 5:36 ` [PATCH 69/77] libertas: " Stephen Hemminger
2009-03-22 5:54 ` David Miller
2009-03-21 5:36 ` [PATCH 70/77] libertas: convert to net_device_ops Stephen Hemminger
2009-03-22 5:54 ` David Miller
2009-03-21 5:36 ` [PATCH 71/77] ipw2x00: convert to internal net_device_stats Stephen Hemminger
2009-03-22 5:56 ` David Miller
2009-03-21 5:36 ` [PATCH 72/77] ipw2x00: convert infrastructure for use by net_device_ops Stephen Hemminger
2009-03-22 5:56 ` David Miller
2009-03-21 5:36 ` [PATCH 73/77] ipw2100: convert to net_device_ops Stephen Hemminger
[not found] ` <20090321053718.145743314-ZtmgI6mnKB3QT0dZR+AlfA@public.gmane.org>
2009-03-22 5:57 ` David Miller
2009-03-21 5:36 ` [PATCH 74/77] ipw2200: " Stephen Hemminger
[not found] ` <20090321053718.224939952-ZtmgI6mnKB3QT0dZR+AlfA@public.gmane.org>
2009-03-22 5:57 ` David Miller
2009-03-21 5:36 ` [PATCH 75/77] hostap: convert to internal net_device_stats Stephen Hemminger
2009-03-22 5:57 ` David Miller
2009-03-21 5:36 ` [PATCH 76/77] hostap: convert to net_device_ops Stephen Hemminger
2009-03-22 5:57 ` David Miller
2009-03-21 5:36 ` [PATCH 77/77] netdev: expose net_device_ops compat as config option Stephen Hemminger
2009-03-22 5:57 ` David Miller
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=20090321053714.584310988@vyatta.com \
--to=shemminger@vyatta.com \
--cc=davem@davemloft.net \
--cc=dbrownell@users.sourceforge.net \
--cc=netdev@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).