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

Commit c5eba0b6 authored by Li RongQing's avatar Li RongQing Committed by David S. Miller
Browse files

openvswitch: distinguish between the dropped and consumed skb 



distinguish between the dropped and consumed skb, not assume the skb
is consumed always

Cc: Thomas Graf <tgraf@noironetworks.com>
Cc: Pravin Shelar <pshelar@nicira.com>
Signed-off-by: default avatarLi RongQing <roy.qing.li@gmail.com>
Acked-by: default avatarPravin B Shelar <pshelar@nicira.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bec6bfb2

net/openvswitch/datapath.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -265,7 +265,10 @@ void ovs_dp_process_received_packet(struct vport *p, struct sk_buff *skb) 
		upcall.key = &key;

		upcall.key = &key;

		upcall.userdata = NULL;

		upcall.userdata = NULL;

		upcall.portid = ovs_vport_find_upcall_portid(p, skb);

		upcall.portid = ovs_vport_find_upcall_portid(p, skb);

		ovs_dp_upcall(dp, skb, &upcall);

		error = ovs_dp_upcall(dp, skb, &upcall);

		if (unlikely(error))

			kfree_skb(skb);

		else

			consume_skb(skb);

			consume_skb(skb);

		stats_counter = &stats->n_missed;

		stats_counter = &stats->n_missed;

		goto out;

		goto out;