bonding: remove unused original_flags struct slave member
authorJiri Pirko <jpirko@redhat.com>
Wed, 19 May 2010 01:17:41 +0000 (01:17 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 2 Jun 2010 11:16:24 +0000 (04:16 -0700)
This is stored but never restored. So remove this as it is useless.

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bonding/bond_main.c
drivers/net/bonding/bonding.h

index 4e7473e..ef60244 100644 (file)
@@ -1535,11 +1535,6 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                goto err_undo_flags;
        }
 
-       /* save slave's original flags before calling
-        * netdev_set_master and dev_open
-        */
-       new_slave->original_flags = slave_dev->flags;
-
        /* Save slave's original mtu and then set it to match the bond */
        new_slave->original_mtu = slave_dev->mtu;
        res = dev_set_mtu(slave_dev, bond->dev->mtu);
index 2aa3367..da80964 100644 (file)
@@ -159,7 +159,6 @@ struct slave {
        s8     link;    /* one of BOND_LINK_XXXX */
        s8     new_link;
        s8     state;   /* one of BOND_STATE_XXXX */
-       u32    original_flags;
        u32    original_mtu;
        u32    link_failure_count;
        u8     perm_hwaddr[ETH_ALEN];