Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba01877f authored by Sridhar Samudrala's avatar Sridhar Samudrala Committed by David S. Miller
Browse files

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: default avatarSridhar Samudrala <sri@us.ibm.com>
Acked-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bb7e95c8

drivers/net/macvlan.c

+7 −4
Original line number Diff line number Diff line
@@ -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;

}