diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-15 15:14:59 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-15 15:14:59 -0800 |
| commit | 9a4a84294b0d60b8c287131478f743ba2bc68949 (patch) | |
| tree | 45985fb0b6055030061b33bb913f6bb2f6b314cb /drivers/net | |
| parent | 8b124a8e14c04378466ddfe63e41fc5035f957eb (diff) | |
| download | linux-9a4a84294b0d60b8c287131478f743ba2bc68949.tar.bz2 | |
8390/8390p: Fix compat netdev ops handling.
Based upon a report from Randy Dunlap.
The compat netdev ops assignments need to happen in
8390.c and 8390p.c, not lib8390.c, as only the type
specific code can assign the correct function pointers.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/8390.c | 11 | ||||
| -rw-r--r-- | drivers/net/8390p.c | 11 | ||||
| -rw-r--r-- | drivers/net/lib8390.c | 6 |
3 files changed, 20 insertions, 8 deletions
diff --git a/drivers/net/8390.c b/drivers/net/8390.c index 029ad08f0330..fbe609a51e02 100644 --- a/drivers/net/8390.c +++ b/drivers/net/8390.c @@ -72,7 +72,16 @@ EXPORT_SYMBOL(ei_netdev_ops); struct net_device *__alloc_ei_netdev(int size) { - return ____alloc_ei_netdev(size); + struct net_device *dev = ____alloc_ei_netdev(size); +#ifdef CONFIG_COMPAT_NET_DEV_OPS + if (dev) { + dev->hard_start_xmit = ei_start_xmit; + dev->get_stats = ei_get_stats; + dev->set_multicast_list = ei_set_multicast_list; + dev->tx_timeout = ei_tx_timeout; + } +#endif + return dev; } EXPORT_SYMBOL(__alloc_ei_netdev); diff --git a/drivers/net/8390p.c b/drivers/net/8390p.c index 9c916d4d206e..ee70b358a816 100644 --- a/drivers/net/8390p.c +++ b/drivers/net/8390p.c @@ -77,7 +77,16 @@ EXPORT_SYMBOL(eip_netdev_ops); struct net_device *__alloc_eip_netdev(int size) { - return ____alloc_ei_netdev(size); + struct net_device *dev = ____alloc_ei_netdev(size); +#ifdef CONFIG_COMPAT_NET_DEV_OPS + if (dev) { + dev->hard_start_xmit = eip_start_xmit; + dev->get_stats = eip_get_stats; + dev->set_multicast_list = eip_set_multicast_list; + dev->tx_timeout = eip_tx_timeout; + } +#endif + return dev; } EXPORT_SYMBOL(__alloc_eip_netdev); diff --git a/drivers/net/lib8390.c b/drivers/net/lib8390.c index 1d36ca4dc6b9..789b6cb744b2 100644 --- a/drivers/net/lib8390.c +++ b/drivers/net/lib8390.c @@ -1010,12 +1010,6 @@ static void ethdev_setup(struct net_device *dev) if (ei_debug > 1) printk(version); -#ifdef CONFIG_COMPAT_NET_DEV_OPS - dev->hard_start_xmit = ei_start_xmit; - dev->get_stats = ei_get_stats; - dev->set_multicast_list = ei_set_multicast_list; - dev->tx_timeout = __ei_tx_timeout; -#endif ether_setup(dev); spin_lock_init(&ei_local->page_lock); |