ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp

[safe/jmp/linux-2.6] / drivers / net / 8390p.c

diff --git a/drivers/net/8390p.c b/drivers/net/8390p.c
index 9c916d4..a2a64ea 100644 (file)
--- a/drivers/net/8390p.c
+++ b/drivers/net/8390p.c
@@ -22,7 +22,7 @@ int eip_close(struct net_device *dev)
 }
 EXPORT_SYMBOL(eip_close);
 
-int eip_start_xmit(struct sk_buff *skb, struct net_device *dev)
+netdev_tx_t eip_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
        return __ei_start_xmit(skb, dev);
 }
@@ -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,10 @@ 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);
+       if (dev)
+               dev->netdev_ops = &eip_netdev_ops;
+       return dev;
 }
 EXPORT_SYMBOL(__alloc_eip_netdev);
 
@@ -87,16 +91,15 @@ void NS8390p_init(struct net_device *dev, int startp)
 }
 EXPORT_SYMBOL(NS8390p_init);
 
-#if defined(MODULE)
-
-int init_module(void)
+static int __init NS8390p_init_module(void)
 {
        return 0;
 }
 
-void cleanup_module(void)
+static void __exit NS8390p_cleanup_module(void)
 {
 }
 
-#endif /* MODULE */
+module_init(NS8390p_init_module);
+module_exit(NS8390p_cleanup_module);
 MODULE_LICENSE("GPL");