* [PATCH net-next-2.6] bonding: remove unused original_flags struct slave member
@ 2010-05-19 11:17 Jiri Pirko
2010-06-02 11:17 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Jiri Pirko @ 2010-05-19 11:17 UTC (permalink / raw)
To: netdev; +Cc: davem, fubar, bonding-devel
This is stored but never restored. So remove this as it is useless.
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
---
drivers/net/bonding/bond_main.c | 5 -----
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 4e7473e..ef60244 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 2aa3367..da80964 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];
--
1.6.6.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next-2.6] bonding: remove unused original_flags struct slave member
2010-05-19 11:17 [PATCH net-next-2.6] bonding: remove unused original_flags struct slave member Jiri Pirko
@ 2010-06-02 11:17 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-06-02 11:17 UTC (permalink / raw)
To: jpirko; +Cc: netdev, fubar, bonding-devel
From: Jiri Pirko <jpirko@redhat.com>
Date: Wed, 19 May 2010 13:17:41 +0200
> This is stored but never restored. So remove this as it is useless.
>
> Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-06-02 11:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-05-19 11:17 [PATCH net-next-2.6] bonding: remove unused original_flags struct slave member Jiri Pirko
2010-06-02 11:17 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).