bonding: remove unused original_flags struct slave member

This is stored but never restored. So remove this as it is useless.

Signed-off-by: Jiri Pirko <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 4e7473e557ff2fc35e859824dfe30a4ec4e56b52..ef6024468d3c8349b54c1213adc61b1a7e0f8ece 100644 (file)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -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);

diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 2aa336720591066734e9ce2ed036c81049fb1caa..da809645c483ef33ab5dfa2c72498544f938ffed 100644 (file)
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -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];