fddi: convert to new network device ops

Similar to ethernet. Convert infrastructure and the one lone FDDI
driver (for the one lone user of that hardware??). Compile tested only.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c
index 282bb47deccc17c2b13963e1a83f9305cee418e5..7fbd4f84f272ca11de6e53c8cf3c8f703fe5b8b0 100644 (file)
--- a/drivers/net/skfp/skfddi.c
+++ b/drivers/net/skfp/skfddi.c
@@ -168,6 +168,17 @@ static int num_boards;     /* total number of adapters configured */
 #define PRINTK(s, args...)
 #endif                         // DRIVERDEBUG
 
+static const struct net_device_ops skfp_netdev_ops = {
+       .ndo_open               = skfp_open,
+       .ndo_stop               = skfp_close,
+       .ndo_start_xmit         = skfp_send_pkt,
+       .ndo_get_stats          = skfp_ctl_get_stats,
+       .ndo_change_mtu         = fddi_change_mtu,
+       .ndo_set_multicast_list = skfp_ctl_set_multicast_list,
+       .ndo_set_mac_address    = skfp_ctl_set_mac_address,
+       .ndo_do_ioctl           = skfp_ioctl,
+};
+
 /*
  * =================
  * = skfp_init_one =
@@ -253,13 +264,7 @@ static int skfp_init_one(struct pci_dev *pdev,
        }
 
        dev->irq = pdev->irq;
-       dev->get_stats = &skfp_ctl_get_stats;
-       dev->open = &skfp_open;
-       dev->stop = &skfp_close;
-       dev->hard_start_xmit = &skfp_send_pkt;
-       dev->set_multicast_list = &skfp_ctl_set_multicast_list;
-       dev->set_mac_address = &skfp_ctl_set_mac_address;
-       dev->do_ioctl = &skfp_ioctl;
+       dev->netdev_ops = &skfp_netdev_ops;
 
        SET_NETDEV_DEV(dev, &pdev->dev);
 

diff --git a/include/linux/fddidevice.h b/include/linux/fddidevice.h
index e61e42dfd3175c5436c8130b16963bfea2052d3e..155bafd9e886607f5ee6b9bd824c2a1fa8ec6c32 100644 (file)
--- a/include/linux/fddidevice.h
+++ b/include/linux/fddidevice.h
@@ -27,6 +27,7 @@
 #ifdef __KERNEL__
 extern __be16  fddi_type_trans(struct sk_buff *skb,
                                struct net_device *dev);
+extern int fddi_change_mtu(struct net_device *dev, int new_mtu);
 extern struct net_device *alloc_fddidev(int sizeof_priv);
 #endif
 

diff --git a/net/802/fddi.c b/net/802/fddi.c
index 0549317b935699f76c604bb06dabbee90492fec4..f1611a1e06a724b155ce6b4768f605fb78d1bc0c 100644 (file)
--- a/net/802/fddi.c
+++ b/net/802/fddi.c
@@ -167,23 +167,27 @@ __be16 fddi_type_trans(struct sk_buff *skb, struct net_device *dev)
 
 EXPORT_SYMBOL(fddi_type_trans);
 
-static int fddi_change_mtu(struct net_device *dev, int new_mtu)
+int fddi_change_mtu(struct net_device *dev, int new_mtu)
 {
        if ((new_mtu < FDDI_K_SNAP_HLEN) || (new_mtu > FDDI_K_SNAP_DLEN))
                return(-EINVAL);
        dev->mtu = new_mtu;
        return(0);
 }
+EXPORT_SYMBOL(fddi_change_mtu);
 
 static const struct header_ops fddi_header_ops = {
        .create         = fddi_header,
        .rebuild        = fddi_rebuild_header,
 };
 
+
 static void fddi_setup(struct net_device *dev)
 {
-       dev->change_mtu         = fddi_change_mtu;
        dev->header_ops         = &fddi_header_ops;
+#ifdef CONFIG_COMPAT_NET_DEV_OPS
+       dev->change_mtu         = fddi_change_mtu,
+#endif
 
        dev->type               = ARPHRD_FDDI;
        dev->hard_header_len    = FDDI_K_SNAP_HLEN+3;   /* Assume 802.2 SNAP hdr len + 3 pad bytes */