Commit:     f12ca5f97b7f99288aff1dc32a91f21c3230fefe
Parent:     91b4f954759653272504c55b715b757207ed1700
Author:     Patrick McHardy <[EMAIL PROTECTED]>
AuthorDate: Mon Jan 21 00:47:08 2008 -0800
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 15:08:36 2008 -0800

    [MACVLAN]: Fix thinko in macvlan_transfer_operstate()
    When the lower device's carrier is off, the macvlan devices's
    carrier state should be checked to decide whether it needs to
    be turned off. Currently the lower device's state is checked
    a second time.
    This still works, but unnecessarily tries to turn off the
    carrier when its already off.
    Signed-off-by: Patrick McHardy <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
 drivers/net/macvlan.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index b7c9791..6ef6b8b 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -375,7 +375,7 @@ static void macvlan_transfer_operstate(struct net_device 
                if (!netif_carrier_ok(dev))
        } else {
-               if (netif_carrier_ok(lowerdev))
+               if (netif_carrier_ok(dev))
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to