ctcm: convert to net_device_ops
authorFrank Blaschka <frank.blaschka@de.ibm.com>
Fri, 9 Jan 2009 03:43:57 +0000 (03:43 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 21 Jan 2009 22:02:42 +0000 (14:02 -0800)
ctcm convert to net_device_ops.

Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/s390/net/ctcm_main.c

index 2678573becec0f625cf58ea92ba904a1128a22d7..8f2a888d0a0ac7226ec61f06ac7da2893c1f876e 100644 (file)
@@ -1099,12 +1099,24 @@ static void ctcm_free_netdevice(struct net_device *dev)
 
 struct mpc_group *ctcmpc_init_mpc_group(struct ctcm_priv *priv);
 
+static const struct net_device_ops ctcm_netdev_ops = {
+       .ndo_open               = ctcm_open,
+       .ndo_stop               = ctcm_close,
+       .ndo_get_stats          = ctcm_stats,
+       .ndo_change_mtu         = ctcm_change_mtu,
+       .ndo_start_xmit         = ctcm_tx,
+};
+
+static const struct net_device_ops ctcm_mpc_netdev_ops = {
+       .ndo_open               = ctcm_open,
+       .ndo_stop               = ctcm_close,
+       .ndo_get_stats          = ctcm_stats,
+       .ndo_change_mtu         = ctcm_change_mtu,
+       .ndo_start_xmit         = ctcmpc_tx,
+};
+
 void static ctcm_dev_setup(struct net_device *dev)
 {
-       dev->open = ctcm_open;
-       dev->stop = ctcm_close;
-       dev->get_stats = ctcm_stats;
-       dev->change_mtu = ctcm_change_mtu;
        dev->type = ARPHRD_SLIP;
        dev->tx_queue_len = 100;
        dev->flags = IFF_POINTOPOINT | IFF_NOARP;
@@ -1157,12 +1169,12 @@ static struct net_device *ctcm_init_netdevice(struct ctcm_priv *priv)
                dev->mtu = MPC_BUFSIZE_DEFAULT -
                                TH_HEADER_LENGTH - PDU_HEADER_LENGTH;
 
-               dev->hard_start_xmit = ctcmpc_tx;
+               dev->netdev_ops = &ctcm_mpc_netdev_ops;
                dev->hard_header_len = TH_HEADER_LENGTH + PDU_HEADER_LENGTH;
                priv->buffer_size = MPC_BUFSIZE_DEFAULT;
        } else {
                dev->mtu = CTCM_BUFSIZE_DEFAULT - LL_HEADER_LENGTH - 2;
-               dev->hard_start_xmit = ctcm_tx;
+               dev->netdev_ops = &ctcm_netdev_ops;
                dev->hard_header_len = LL_HEADER_LENGTH + 2;
        }