X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=drivers%2Fnet%2Fmacvlan.c;h=5360f73c9817f25b8b702c37da3e46111d6095ac;hb=b13ba1b83f524732523db1079e56478b32c85c96;hp=60406b01f9eb37b6a5728d18a72164b0a2598eb3;hpb=c4d7099867c7e7ade7693a5ac06f12b3c3cdbf8e;p=~andy%2Flinux

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 60406b01f9e..5360f73c981 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -338,6 +338,8 @@ static const struct header_ops macvlan_hard_header_ops = {
 	.cache_update	= eth_header_cache_update,
 };
 
+static struct rtnl_link_ops macvlan_link_ops;
+
 static int macvlan_open(struct net_device *dev)
 {
 	struct macvlan_dev *vlan = netdev_priv(dev);
@@ -353,7 +355,8 @@ static int macvlan_open(struct net_device *dev)
 		goto hash_add;
 	}
 
-	if (lowerdev->features & NETIF_F_HW_L2FW_DOFFLOAD) {
+	if (lowerdev->features & NETIF_F_HW_L2FW_DOFFLOAD &&
+	    dev->rtnl_link_ops == &macvlan_link_ops) {
 		vlan->fwd_priv =
 		      lowerdev->netdev_ops->ndo_dfwd_add_station(lowerdev, dev);