From 0774a4600f179964fd406a22b225f534427af57b Mon Sep 17 00:00:00 2001 From: David Ward Date: Thu, 19 May 2011 02:53:20 +0000 Subject: [PATCH] --- yaml --- r: 247963 b: refs/heads/master c: a37dd3332319260cce81ac91ce25fcc3a31de997 h: refs/heads/master i: 247961: a8646d604621b7f3eac2a18f7f929a6d045dae4a 247959: 267c96e9c91864bf320c3e48fe1529465c85d924 v: v3 --- [refs] | 2 +- trunk/drivers/net/macvlan.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) 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; }