diff --git a/[refs] b/[refs] index 541586116aea..3f8627e575bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 67f11f4deda0818640decb19a28c537dbe5d429e +refs/heads/master: a37dd3332319260cce81ac91ce25fcc3a31de997 diff --git a/trunk/drivers/net/macvlan.c b/trunk/drivers/net/macvlan.c index d72a70615c0f..d6aeaa5f25ea 100644 --- a/trunk/drivers/net/macvlan.c +++ b/trunk/drivers/net/macvlan.c @@ -238,10 +238,8 @@ static int macvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev) dest = macvlan_hash_lookup(port, eth->h_dest); if (dest && dest->mode == MACVLAN_MODE_BRIDGE) { - unsigned int length = skb->len + ETH_HLEN; - int ret = dest->forward(dest->dev, skb); - macvlan_count_rx(dest, length, - ret == NET_RX_SUCCESS, 0); + /* send to lowerdev first for its network taps */ + vlan->forward(vlan->lowerdev, skb); return NET_XMIT_SUCCESS; }