From 38a4c623bcc394e8acdabedfb05d2e8d47e0ce5e Mon Sep 17 00:00:00 2001 From: Jiri Pirko Date: Wed, 19 May 2010 01:17:41 +0000 Subject: [PATCH] --- yaml --- r: 202634 b: refs/heads/master c: 5206e24c2c348d739c31ebed10a741a02bbde9e0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_main.c | 5 ----- trunk/drivers/net/bonding/bonding.h | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 0b867cbd7819..4bc5bc8021f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c20811a79e671a6a1fe86a8c1afe04aca8a7f085 +refs/heads/master: 5206e24c2c348d739c31ebed10a741a02bbde9e0 diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c index 4e7473e557ff..ef6024468d3c 100644 --- a/trunk/drivers/net/bonding/bond_main.c +++ b/trunk/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/trunk/drivers/net/bonding/bonding.h b/trunk/drivers/net/bonding/bonding.h index 2aa336720591..da809645c483 100644 --- a/trunk/drivers/net/bonding/bonding.h +++ b/trunk/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];