diff options
| author | Eric Van Hensbergen <ericvh@arlx147.austin.ibm.com> | 2009-12-01 13:30:12 -0600 |
|---|---|---|
| committer | Eric Van Hensbergen <ericvh@arlx147.austin.ibm.com> | 2009-12-01 13:30:59 -0600 |
| commit | 3195f11c09bb1a193681ea794e76b252f9a8bc77 (patch) | |
| tree | 95ce31cccdd4121effa2fa8b0ac2bf05e2f04406 | |
| parent | b65750347b9c97b9cb847d144036a43520fbe69a (diff) | |
| download | systemsim-2.6.31.tar.gz | |
systemsim_net: fix bogus net to compile cleansystemsim-2.6.31
Changes provided by Mike Kistler.
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
| -rw-r--r-- | drivers/net/systemsim_net.c | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/drivers/net/systemsim_net.c b/drivers/net/systemsim_net.c index b5b816957e7759..53c2b55e3356f2 100644 --- a/drivers/net/systemsim_net.c +++ b/drivers/net/systemsim_net.c @@ -232,7 +232,7 @@ static void systemsim_net_timer(struct work_struct *ptp) } } -static struct net_device_stats *get_stats(struct net_device *dev) +static struct net_device_stats *systemsim_net_get_stats(struct net_device *dev) { struct netdev_private *priv = netdev_priv(dev); return (struct net_device_stats *)&(priv->stats); @@ -300,13 +300,6 @@ static int systemsim_net_close(struct net_device *dev) return 0; } -static struct net_device_stats systemsim_net_stats; - -static struct net_device_stats *systemsim_net_get_stats(struct net_device *dev) -{ - return &systemsim_net_stats; -} - static int systemsim_net_set_mac_address(struct net_device *dev, void *p) { return -EOPNOTSUPP; @@ -317,6 +310,15 @@ static int systemsim_net_ioctl(struct net_device *dev, struct ifreq *ifr, return -EOPNOTSUPP; } +static const struct net_device_ops systemsim_netdev_ops = { + .ndo_open = systemsim_net_open, + .ndo_stop = systemsim_net_close, + .ndo_start_xmit = systemsim_net_start_xmit, + .ndo_get_stats = systemsim_net_get_stats, + .ndo_set_mac_address = systemsim_net_set_mac_address, + .ndo_do_ioctl = systemsim_net_ioctl +}; + /* Initialize the rest of the device. */ int __init do_systemsim_net_probe(struct net_device *dev) { @@ -339,17 +341,11 @@ int __init do_systemsim_net_probe(struct net_device *dev) dev->irq = irq; dev->mtu = SYSTEMSIM_MTU; - dev->open = systemsim_net_open; - dev->stop = systemsim_net_close; - dev->hard_start_xmit = systemsim_net_start_xmit; - dev->get_stats = systemsim_net_get_stats; - dev->set_mac_address = systemsim_net_set_mac_address; - dev->do_ioctl = systemsim_net_ioctl; + dev->netdev_ops = &systemsim_netdev_ops; priv = netdev_priv(dev); priv->devno = devno; priv->closing = 0; - dev->get_stats = get_stats; if (dev->irq == 0) { priv->data = (void *)dev; |