X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=drivers%2Fnet%2Fmacvlan.c;h=f651a816b280bfcb04d1d6fdda8d12e2819b4ce5;hb=5efa1d1c940f07e79469e20db2b7a73c44180e82;hp=b7c9791009d06781b637c4e4db19a77cfdd06eaf;hpb=ad5d20a63940fcfb40af76ba06148f36d5d0b433;p=safe%2Fjmp%2Flinux-2.6

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index b7c9791..f651a81 100644
--- 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;
 }