diff options
| author | Sridhar Samudrala <sri@us.ibm.com> | 2010-07-27 09:10:07 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-27 21:02:42 -0700 |
| commit | ba01877f56c3244b21746d3f1537f7647ed97984 (patch) | |
| tree | 4ec17efb2261d933b5b1f4839a2ec03e8ca4f96f /drivers/net | |
| parent | bb7e95c8fd859922c6cf3ebbb3a8546007df1748 (diff) | |
| download | op-kernel-dev-ba01877f56c3244b21746d3f1537f7647ed97984.zip op-kernel-dev-ba01877f56c3244b21746d3f1537f7647ed97984.tar.gz | |
macvlan: Fix rx counters update in macvlan_handle_frame()
Fix macvlan_handle_frame() to update the rx counters based
on the return value of the vlan->receive call.
Updated the patch to not do any packet count drops when the interface
is down based on Herber'ts comments.
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/macvlan.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 6e9da96..0ef0eb0 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -158,7 +158,8 @@ static struct sk_buff *macvlan_handle_frame(struct sk_buff *skb) const struct macvlan_dev *vlan; const struct macvlan_dev *src; struct net_device *dev; - unsigned int len; + unsigned int len = 0; + int ret = NET_RX_DROP; port = macvlan_port_get_rcu(skb->dev); if (is_multicast_ether_addr(eth->h_dest)) { @@ -195,14 +196,16 @@ static struct sk_buff *macvlan_handle_frame(struct sk_buff *skb) } len = skb->len + ETH_HLEN; skb = skb_share_check(skb, GFP_ATOMIC); - macvlan_count_rx(vlan, len, skb != NULL, 0); if (!skb) - return NULL; + goto out; skb->dev = dev; skb->pkt_type = PACKET_HOST; - vlan->receive(skb); + ret = vlan->receive(skb); + +out: + macvlan_count_rx(vlan, len, ret == NET_RX_SUCCESS, 0); return NULL; } |
