diff options
| author |   Jiri Pirko <jpirko@redhat.com> | 2010-05-19 01:17:41 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-06-02 04:16:24 -0700 |
| commit | 5206e24c2c348d739c31ebed10a741a02bbde9e0 (patch) | |
| tree | 28993a140fb5cdbd6c9b47e091207a8af866d888 /drivers/net/bonding | |
| parent | bonding: move dev_addr cpy to bond_enslave (diff) | |
| download | linux-dev-5206e24c2c348d739c31ebed10a741a02bbde9e0.tar.xz linux-dev-5206e24c2c348d739c31ebed10a741a02bbde9e0.zip | |
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.c | 5 | ||||
| -rw-r--r-- | drivers/net/bonding/bonding.h | 1 |
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) 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 2aa336720591..da809645c483 100644 --- 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]; |