diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2008-11-20 00:32:24 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-20 00:32:24 -0500 |
commit | d314774cf2cd5dfeb39a00d37deee65d4c627927 (patch) | |
tree | 1c7778b509cea814aa2b7115949667941037d07c /net/core/netpoll.c | |
parent | 6b41e7dd90c6a628ab5fb8d781302d60a243b2ce (diff) |
netdev: network device operations infrastructure
This patch changes the network device internal API to move adminstrative
operations out of the network device structure and into a separate structure.
This patch involves some hackery to maintain compatablity between the
new and old model, so all 300+ drivers don't have to be changed at once.
For drivers that aren't converted yet, the netdevice_ops virt function list
still resides in the net_device structure. For old protocols, the new
net_device_ops are copied out to the old net_device pointers.
After the transistion is completed the nag message can be changed to
an WARN_ON, and the compatiablity code can be made configurable.
Some function pointers aren't moved:
* destructor can't be in net_device_ops because
it may need to be referenced after the module is unloaded.
* neighbor setup is manipulated in a couple of places that need special
consideration
* hard_start_xmit is in the fast path for transmit.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/netpoll.c')
-rw-r--r-- | net/core/netpoll.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index fc4e28e23b89..630df6034444 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c | |||
@@ -172,12 +172,13 @@ static void service_arp_queue(struct netpoll_info *npi) | |||
172 | void netpoll_poll(struct netpoll *np) | 172 | void netpoll_poll(struct netpoll *np) |
173 | { | 173 | { |
174 | struct net_device *dev = np->dev; | 174 | struct net_device *dev = np->dev; |
175 | const struct net_device_ops *ops = dev->netdev_ops; | ||
175 | 176 | ||
176 | if (!dev || !netif_running(dev) || !dev->poll_controller) | 177 | if (!dev || !netif_running(dev) || !ops->ndo_poll_controller) |
177 | return; | 178 | return; |
178 | 179 | ||
179 | /* Process pending work on NIC */ | 180 | /* Process pending work on NIC */ |
180 | dev->poll_controller(dev); | 181 | ops->ndo_poll_controller(dev); |
181 | 182 | ||
182 | poll_napi(dev); | 183 | poll_napi(dev); |
183 | 184 | ||
@@ -694,7 +695,7 @@ int netpoll_setup(struct netpoll *np) | |||
694 | atomic_inc(&npinfo->refcnt); | 695 | atomic_inc(&npinfo->refcnt); |
695 | } | 696 | } |
696 | 697 | ||
697 | if (!ndev->poll_controller) { | 698 | if (!ndev->netdev_ops->ndo_poll_controller) { |
698 | printk(KERN_ERR "%s: %s doesn't support polling, aborting.\n", | 699 | printk(KERN_ERR "%s: %s doesn't support polling, aborting.\n", |
699 | np->name, np->dev_name); | 700 | np->name, np->dev_name); |
700 | err = -ENOTSUPP; | 701 | err = -ENOTSUPP; |