via-velocity: section fix

[linux-2.6] / drivers / net / macvlan.c

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index b7c9791009d06781b637c4e4db19a77cfdd06eaf..f651a816b280bfcb04d1d6fdda8d12e2819b4ce5 100644 (file)
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -375,7 +375,7 @@ static void macvlan_transfer_operstate(struct net_device *dev)
                if (!netif_carrier_ok(dev))
                        netif_carrier_on(dev);
        } else {
-               if (netif_carrier_ok(lowerdev))
+               if (netif_carrier_ok(dev))
                        netif_carrier_off(dev);
        }
 }
@@ -508,7 +508,7 @@ static int __init macvlan_init_module(void)
                goto err1;
        return 0;
 err1:
-       macvlan_handle_frame_hook = macvlan_handle_frame;
+       macvlan_handle_frame_hook = NULL;
        unregister_netdevice_notifier(&macvlan_notifier_block);
        return err;
 }