From 043eb9c6cb7a8ab887efb8de17309f45f8858c88 Mon Sep 17 00:00:00 2001 From: Sridhar Samudrala Date: Tue, 27 Jul 2010 09:10:07 +0000 Subject: [PATCH] --- yaml --- r: 203780 b: refs/heads/master c: ba01877f56c3244b21746d3f1537f7647ed97984 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/macvlan.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f46d70a72fdc..d4f31f431e55 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb7e95c8fd859922c6cf3ebbb3a8546007df1748 +refs/heads/master: ba01877f56c3244b21746d3f1537f7647ed97984 diff --git a/trunk/drivers/net/macvlan.c b/trunk/drivers/net/macvlan.c index 6e9da96a87b2..0ef0eb0db945 100644 --- a/trunk/drivers/net/macvlan.c +++ b/trunk/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; }