From: Stephen Hemminger <shemminger@vyatta•com>
To: David Miller <davem@davemloft•net>, Karsten Keil <kkeil@suse•de>
Cc: netdev@vger•kernel.org
Subject: [PATCH 33/42] I4l: convert to net_device_ops
Date: Tue, 06 Jan 2009 16:33:49 -0800 [thread overview]
Message-ID: <20090107003349.068812158@vyatta.com> (raw)
In-Reply-To: 20090107003316.784424362@vyatta.com
[-- Attachment #1: i4l.patch --]
[-- Type: text/plain, Size: 4049 bytes --]
Add net_device_ops and use interal stats
Signed-off-by: Stephen Hemminger <shemminger@vyatta•com>
--- a/drivers/isdn/i4l/isdn_net.c 2009-01-03 22:04:20.322771793 -0800
+++ b/drivers/isdn/i4l/isdn_net.c 2009-01-03 22:25:41.290763701 -0800
@@ -1485,6 +1485,24 @@ isdn_ciscohdlck_dev_ioctl(struct net_dev
return (rc);
}
+
+static int isdn_net_ioctl(struct net_device *dev,
+ struct ifreq *ifr, int cmd)
+{
+ isdn_net_local *lp = (isdn_net_local *) netdev_priv(dev);
+
+ switch (lp->p_encap) {
+#ifdef CONFIG_ISDN_PPP
+ case ISDN_NET_ENCAP_SYNCPPP:
+ return isdn_ppp_dev_ioctl(dev, ifr, cmd);
+#endif
+ case ISDN_NET_ENCAP_CISCOHDLCK:
+ return isdn_ciscohdlck_dev_ioctl(dev, ifr, cmd);
+ default:
+ return -EINVAL;
+ }
+}
+
/* called via cisco_timer.function */
static void
isdn_net_ciscohdlck_slarp_send_keepalive(unsigned long data)
@@ -1998,23 +2016,6 @@ isdn_net_init(struct net_device *ndev)
ushort max_hlhdr_len = 0;
int drvidx;
- ether_setup(ndev);
- ndev->header_ops = NULL;
-
- /* Setup the generic properties */
- ndev->mtu = 1500;
- ndev->flags = IFF_NOARP|IFF_POINTOPOINT;
- ndev->type = ARPHRD_ETHER;
- ndev->addr_len = ETH_ALEN;
- ndev->validate_addr = NULL;
-
- /* for clients with MPPP maybe higher values better */
- ndev->tx_queue_len = 30;
-
- /* The ISDN-specific entries in the device structure. */
- ndev->open = &isdn_net_open;
- ndev->hard_start_xmit = &isdn_net_start_xmit;
-
/*
* up till binding we ask the protocol layer to reserve as much
* as we might need for HL layer
@@ -2026,9 +2027,6 @@ isdn_net_init(struct net_device *ndev)
max_hlhdr_len = dev->drv[drvidx]->interface->hl_hdrlen;
ndev->hard_header_len = ETH_HLEN + max_hlhdr_len;
- ndev->stop = &isdn_net_close;
- ndev->get_stats = &isdn_net_get_stats;
- ndev->do_ioctl = NULL;
return 0;
}
@@ -2508,6 +2506,19 @@ isdn_net_force_dial(char *name)
return (isdn_net_force_dial_lp(p->local));
}
+/* The ISDN-specific entries in the device structure. */
+static const struct net_device_ops isdn_netdev_ops = {
+ .ndo_init = isdn_net_init,
+ .ndo_open = isdn_net_open,
+ .ndo_stop = isdn_net_close,
+ .ndo_do_ioctl = isdn_net_ioctl,
+
+ .ndo_validate_addr = NULL,
+ .ndo_start_xmit = isdn_net_start_xmit,
+ .ndo_get_stats = isdn_net_get_stats,
+ .ndo_tx_timeout = isdn_net_tx_timeout,
+};
+
/*
* Helper for alloc_netdev()
*/
@@ -2515,7 +2526,20 @@ static void _isdn_setup(struct net_devic
{
isdn_net_local *lp = netdev_priv(dev);
+ ether_setup(dev);
+
dev->flags = IFF_NOARP | IFF_POINTOPOINT;
+ /* Setup the generic properties */
+ dev->mtu = 1500;
+ dev->flags = IFF_NOARP|IFF_POINTOPOINT;
+ dev->type = ARPHRD_ETHER;
+ dev->addr_len = ETH_ALEN;
+ dev->header_ops = NULL;
+ dev->netdev_ops = &isdn_netdev_ops;
+
+ /* for clients with MPPP maybe higher values better */
+ dev->tx_queue_len = 30;
+
lp->p_encap = ISDN_NET_ENCAP_RAWIP;
lp->magic = ISDN_NET_MAGIC;
lp->last = lp;
@@ -2570,7 +2594,7 @@ isdn_net_new(char *name, struct net_devi
return NULL;
}
netdev->local = netdev_priv(netdev->dev);
- netdev->dev->init = isdn_net_init;
+
if (master) {
/* Device shall be a slave */
struct net_device *p = MASTER_TO_SLAVE(master);
@@ -2588,7 +2612,6 @@ isdn_net_new(char *name, struct net_devi
/*
* Watchdog timer (currently) for master only.
*/
- netdev->dev->tx_timeout = isdn_net_tx_timeout;
netdev->dev->watchdog_timeo = ISDN_NET_TX_TIMEOUT;
if (register_netdev(netdev->dev) != 0) {
printk(KERN_WARNING "isdn_net: Could not register net-device\n");
@@ -2704,7 +2727,6 @@ isdn_net_setcfg(isdn_net_ioctl_cfg * cfg
#else
p->dev->type = ARPHRD_PPP; /* change ARP type */
p->dev->addr_len = 0;
- p->dev->do_ioctl = isdn_ppp_dev_ioctl;
#endif
break;
case ISDN_NET_ENCAP_X25IFACE:
@@ -2718,7 +2740,6 @@ isdn_net_setcfg(isdn_net_ioctl_cfg * cfg
#endif
break;
case ISDN_NET_ENCAP_CISCOHDLCK:
- p->dev->do_ioctl = isdn_ciscohdlck_dev_ioctl;
break;
default:
if( cfg->p_encap >= 0 &&
--
next prev parent reply other threads:[~2009-01-07 0:54 UTC|newest]
Thread overview: 97+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-07 0:33 [PATCH 00/42] Still more net_device API updates Stephen Hemminger
2009-01-07 0:33 ` [PATCH 01/42] appletalk: convert aarp to net_device_ops Stephen Hemminger
2009-01-08 1:21 ` David Miller
2009-01-08 3:09 ` Joe Perches
2009-01-08 4:39 ` David Miller
2009-01-07 0:33 ` [PATCH 02/42] appletalk: convert ipddp " Stephen Hemminger
2009-01-08 1:22 ` David Miller
2009-01-07 0:33 ` [PATCH 03/42] bluetooth: driver API update Stephen Hemminger
[not found] ` <20090107003345.753201945-ZtmgI6mnKB3QT0dZR+AlfA@public.gmane.org>
2009-01-07 1:53 ` Marcel Holtmann
2009-01-08 1:23 ` David Miller
2009-01-07 0:33 ` [PATCH 05/42] cassini: update to net_device_ops Stephen Hemminger
2009-01-08 1:25 ` David Miller
2009-01-07 0:33 ` [PATCH 06/42] ipg: " Stephen Hemminger
2009-01-07 7:59 ` Pekka Enberg
2009-01-08 1:26 ` David Miller
2009-01-07 0:33 ` [PATCH 07/42] plip: " Stephen Hemminger
2009-01-08 1:26 ` David Miller
2009-01-07 0:33 ` [PATCH 08/42] tlan: " Stephen Hemminger
2009-01-08 1:27 ` David Miller
2009-01-07 0:33 ` [PATCH 09/42] epic100: " Stephen Hemminger
2009-01-08 1:27 ` David Miller
2009-01-07 0:33 ` [PATCH 10/42] sunhme: " Stephen Hemminger
2009-01-08 1:28 ` David Miller
2009-01-07 0:33 ` [PATCH 11/42] sungem: " Stephen Hemminger
2009-01-08 1:29 ` David Miller
2009-01-07 0:33 ` [PATCH 12/42] pcnet32: " Stephen Hemminger
2009-01-08 1:29 ` David Miller
2009-01-07 0:33 ` [PATCH 13/42] typhoon: " Stephen Hemminger
2009-01-08 1:29 ` David Miller
2009-01-07 0:33 ` [PATCH 14/42] enc28j60: " Stephen Hemminger
2009-01-08 1:30 ` David Miller
2009-01-07 0:33 ` [PATCH 16/42] de600: " Stephen Hemminger
2009-01-08 1:35 ` David Miller
2009-01-08 1:48 ` [PATCH 15/42] hp100: " Stephen Hemminger
2009-01-08 2:13 ` David Miller
2009-01-07 0:33 ` [PATCH 17/42] sis190: " Stephen Hemminger
2009-01-08 1:35 ` David Miller
2009-01-07 0:33 ` [PATCH 18/42] ns83820: fix net_device_ops support Stephen Hemminger
2009-01-08 1:36 ` David Miller
2009-01-07 0:33 ` [PATCH 19/42] sb1000: update to net_device_ops Stephen Hemminger
2009-01-08 1:57 ` David Miller
2009-01-07 0:33 ` [PATCH 20/42] natsemi: " Stephen Hemminger
2009-01-08 1:57 ` David Miller
2009-01-07 0:33 ` [PATCH 21/42] fealnx: " Stephen Hemminger
2009-01-08 1:57 ` David Miller
2009-01-07 0:33 ` [PATCH 22/42] starfire: " Stephen Hemminger
2009-01-08 1:58 ` David Miller
2009-01-07 0:33 ` [PATCH 23/42] sundance: " Stephen Hemminger
2009-01-08 1:58 ` David Miller
2009-01-07 0:33 ` [PATCH 24/42] tulip: convert devices to new API Stephen Hemminger
2009-01-07 7:49 ` Grant Grundler
2009-01-08 1:59 ` David Miller
2009-01-07 0:33 ` [PATCH 25/42] de2104x: convert to net_device_ops Stephen Hemminger
2009-01-07 7:50 ` Grant Grundler
2009-01-08 1:59 ` David Miller
2009-01-07 0:33 ` [PATCH 26/42] de4x5: " Stephen Hemminger
2009-01-08 2:00 ` David Miller
2009-01-07 0:33 ` [PATCH 27/42] xircom: convert devices to new API Stephen Hemminger
2009-01-08 2:01 ` David Miller
2009-01-07 0:33 ` [PATCH 28/42] dmfe: convert " Stephen Hemminger
2009-01-08 21:16 ` Grant Grundler
2009-01-08 21:32 ` David Miller
2009-01-07 0:33 ` [PATCH 29/42] uli526x: convert devices " Stephen Hemminger
2009-01-08 2:01 ` David Miller
2009-01-07 0:33 ` [PATCH 30/42] windbond: " Stephen Hemminger
2009-01-08 2:02 ` David Miller
2009-01-07 0:33 ` [PATCH 31/42] dvb: update network device to current API Stephen Hemminger
2009-01-08 2:02 ` David Miller
2009-01-07 0:33 ` [PATCH 32/42] hysdn: convert to net_device_ops and other updates Stephen Hemminger
2009-01-08 2:03 ` David Miller
2009-01-07 0:33 ` Stephen Hemminger [this message]
2009-01-07 0:33 ` [PATCH 34/42] fusion: convert devices to new API Stephen Hemminger
2009-01-08 2:04 ` David Miller
2009-01-07 0:33 ` [PATCH 35/42] xpnet: " Stephen Hemminger
2009-01-08 2:05 ` David Miller
2009-01-07 0:33 ` [PATCH 36/42] gadget: " Stephen Hemminger
2009-01-08 2:05 ` David Miller
2009-01-07 0:33 ` [PATCH 37/42] synclink: " Stephen Hemminger
2009-01-07 23:48 ` [PATCH 37/42] synclink: convert devices to new API (rev2) Stephen Hemminger
2009-01-08 2:08 ` David Miller
2009-01-08 22:49 ` Krzysztof Halasa
2009-01-08 22:55 ` Krzysztof Halasa
2009-01-13 0:18 ` David Miller
2009-01-07 0:33 ` [PATCH 38/42] uwb: convert devices to net_device_ops Stephen Hemminger
2009-01-07 10:38 ` David Vrabel
2009-01-08 2:09 ` David Miller
2009-01-07 0:33 ` [PATCH 39/42] slip: convert " Stephen Hemminger
2009-01-08 2:09 ` David Miller
2009-01-07 0:33 ` [PATCH 40/42] amd8111e: " Stephen Hemminger
2009-01-08 2:10 ` David Miller
2009-01-07 0:33 ` [PATCH 41/42] atp: " Stephen Hemminger
2009-01-08 2:10 ` David Miller
2009-01-07 0:33 ` [PATCH 42/42] b44: " Stephen Hemminger
2009-01-08 2:10 ` David Miller
[not found] ` <20090107003345.872219054@vyatta.com>
2009-01-08 1:25 ` [PATCH 04/42] phonet: update " David Miller
-- strict thread matches above, loose matches on Subject: below --
2009-01-07 11:30 [PATCH 33/42] I4l: convert " Karsten Keil
2009-01-08 2:04 ` 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=20090107003349.068812158@vyatta.com \
--to=shemminger@vyatta$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=kkeil@suse$(echo .)de \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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