aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding
diff options
context:
space:
mode:
authorJiri Pirko <jpirko@redhat.com>2010-05-18 21:17:41 -0400
committerDavid S. Miller <davem@davemloft.net>2010-06-02 07:16:24 -0400
commit5206e24c2c348d739c31ebed10a741a02bbde9e0 (patch)
tree28993a140fb5cdbd6c9b47e091207a8af866d888 /drivers/net/bonding
parentc20811a79e671a6a1fe86a8c1afe04aca8a7f085 (diff)
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 <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r--drivers/net/bonding/bond_main.c5
-rw-r--r--drivers/net/bonding/bonding.h1
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 4e7473e557ff..ef6024468d3c 100644
--- 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)
1535 goto err_undo_flags; 1535 goto err_undo_flags;
1536 } 1536 }
1537 1537
1538 /* save slave's original flags before calling
1539 * netdev_set_master and dev_open
1540 */
1541 new_slave->original_flags = slave_dev->flags;
1542
1543 /* Save slave's original mtu and then set it to match the bond */ 1538 /* Save slave's original mtu and then set it to match the bond */
1544 new_slave->original_mtu = slave_dev->mtu; 1539 new_slave->original_mtu = slave_dev->mtu;
1545 res = dev_set_mtu(slave_dev, bond->dev->mtu); 1540 res = dev_set_mtu(slave_dev, bond->dev->mtu);
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 2aa336720591..da809645c483 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -159,7 +159,6 @@ struct slave {
159 s8 link; /* one of BOND_LINK_XXXX */ 159 s8 link; /* one of BOND_LINK_XXXX */
160 s8 new_link; 160 s8 new_link;
161 s8 state; /* one of BOND_STATE_XXXX */ 161 s8 state; /* one of BOND_STATE_XXXX */
162 u32 original_flags;
163 u32 original_mtu; 162 u32 original_mtu;
164 u32 link_failure_count; 163 u32 link_failure_count;
165 u8 perm_hwaddr[ETH_ALEN]; 164 u8 perm_hwaddr[ETH_ALEN];