Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-omap-h63xx.git] / drivers / net / 8390p.c

diff --git a/drivers/net/8390p.c b/drivers/net/8390p.c
index 9c916d4d206efe56ee9cfdb17cba1f5b635998d9..da863c91d1d03d79df3c59785d09162190e0c581 100644 (file)
--- a/drivers/net/8390p.c
+++ b/drivers/net/8390p.c
@@ -68,6 +68,7 @@ const struct net_device_ops eip_netdev_ops = {
        .ndo_get_stats          = eip_get_stats,
        .ndo_set_multicast_list = eip_set_multicast_list,
        .ndo_validate_addr      = eth_validate_addr,
+       .ndo_set_mac_address    = eth_mac_addr,
        .ndo_change_mtu         = eth_change_mtu,
 #ifdef CONFIG_NET_POLL_CONTROLLER
        .ndo_poll_controller    = eip_poll,
@@ -77,7 +78,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);