bridge: convert to net_device_ops

Convert to net_device_ops function table.

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

1 files changed, 11 insertions, 7 deletions

diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index 6c023f0f8252..920ce3348398 100644
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -147,7 +147,7 @@ static int br_set_tx_csum(struct net_device *dev, u32 data)
         return 0;
 }
 
-static struct ethtool_ops br_ethtool_ops = {
+static const struct ethtool_ops br_ethtool_ops = {
         .get_drvinfo    = br_getinfo,
         .get_link       = ethtool_op_get_link,
         .get_tx_csum    = ethtool_op_get_tx_csum,
@@ -160,21 +160,25 @@ static struct ethtool_ops br_ethtool_ops = {
         .get_flags      = ethtool_op_get_flags,
 };
 
+static const struct net_device_ops br_netdev_ops = {
+        .ndo_open                = br_dev_open,
+        .ndo_stop                = br_dev_stop,
+        .ndo_set_mac_address = br_set_mac_address,
+        .ndo_set_multicast_list = br_dev_set_multicast_list,
+        .ndo_change_mtu  = br_change_mtu,
+        .ndo_do_ioctl   = br_dev_ioctl,
+};
+
 void br_dev_setup(struct net_device *dev)
 {
         random_ether_addr(dev->dev_addr);
         ether_setup(dev);
 
-        dev->do_ioctl = br_dev_ioctl;
+        dev->netdev_ops = &br_netdev_ops;
         dev->hard_start_xmit = br_dev_xmit;
-        dev->open = br_dev_open;
-        dev->set_multicast_list = br_dev_set_multicast_list;
-        dev->change_mtu = br_change_mtu;
         dev->destructor = free_netdev;
         SET_ETHTOOL_OPS(dev, &br_ethtool_ops);
-        dev->stop = br_dev_stop;
         dev->tx_queue_len = 0;
-        dev->set_mac_address = br_set_mac_address;
         dev->priv_flags = IFF_EBRIDGE;
 
         dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HIGHDMA |