aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge/br_device.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/bridge/br_device.c')
-rw-r--r--net/bridge/br_device.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index 920ce3348398..18538d7460d7 100644
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -163,10 +163,11 @@ static const struct ethtool_ops br_ethtool_ops = {
163static const struct net_device_ops br_netdev_ops = { 163static const struct net_device_ops br_netdev_ops = {
164 .ndo_open = br_dev_open, 164 .ndo_open = br_dev_open,
165 .ndo_stop = br_dev_stop, 165 .ndo_stop = br_dev_stop,
166 .ndo_set_mac_address = br_set_mac_address, 166 .ndo_start_xmit = br_dev_xmit,
167 .ndo_set_multicast_list = br_dev_set_multicast_list, 167 .ndo_set_mac_address = br_set_mac_address,
168 .ndo_change_mtu = br_change_mtu, 168 .ndo_set_multicast_list = br_dev_set_multicast_list,
169 .ndo_do_ioctl = br_dev_ioctl, 169 .ndo_change_mtu = br_change_mtu,
170 .ndo_do_ioctl = br_dev_ioctl,
170}; 171};
171 172
172void br_dev_setup(struct net_device *dev) 173void br_dev_setup(struct net_device *dev)
@@ -175,7 +176,6 @@ void br_dev_setup(struct net_device *dev)
175 ether_setup(dev); 176 ether_setup(dev);
176 177
177 dev->netdev_ops = &br_netdev_ops; 178 dev->netdev_ops = &br_netdev_ops;
178 dev->hard_start_xmit = br_dev_xmit;
179 dev->destructor = free_netdev; 179 dev->destructor = free_netdev;
180 SET_ETHTOOL_OPS(dev, &br_ethtool_ops); 180 SET_ETHTOOL_OPS(dev, &br_ethtool_ops);
181 dev->tx_queue_len = 0; 181 dev->tx_queue_len = 0;