[NETFILTER]: ipt_CLUSTERIP: kill clusterip_config_entry_get

[linux-2.6-omap-h63xx.git] / net / bridge / br_device.c

diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index 99292e8e1d0f05f2f813d85b08c8497e31c1d98d..bf7787395fe09c17e25cbcea93f089386aad5af8 100644 (file)
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -150,18 +150,14 @@ static int br_set_tx_csum(struct net_device *dev, u32 data)
 static struct ethtool_ops br_ethtool_ops = {
        .get_drvinfo = br_getinfo,
        .get_link = ethtool_op_get_link,
-       .get_sg = ethtool_op_get_sg,
        .set_sg = br_set_sg,
-       .get_tx_csum = ethtool_op_get_tx_csum,
        .set_tx_csum = br_set_tx_csum,
-       .get_tso = ethtool_op_get_tso,
        .set_tso = br_set_tso,
 };
 
 void br_dev_setup(struct net_device *dev)
 {
-       memset(dev->dev_addr, 0, ETH_ALEN);
-
+       random_ether_addr(dev->dev_addr);
        ether_setup(dev);
 
        dev->do_ioctl = br_dev_ioctl;
@@ -171,7 +167,6 @@ void br_dev_setup(struct net_device *dev)
        dev->set_multicast_list = br_dev_set_multicast_list;
        dev->change_mtu = br_change_mtu;
        dev->destructor = free_netdev;
-       SET_MODULE_OWNER(dev);
        SET_ETHTOOL_OPS(dev, &br_ethtool_ops);
        dev->stop = br_dev_stop;
        dev->tx_queue_len = 0;