Commit e3f48d37 authored Feb 28, 2011 by Jiri Pirko Committed by David S. Miller Mar 07, 2011

net: allow handlers to be processed for orig_dev



This was there before, I forgot about this. Allows deliveries to
ptype_base handlers registered for orig_dev. I presume this is still
desired.

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Reviewed-by: Nicolas de Pesloüan <nicolas.2p.debian@free.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent f21b538c

net/core/dev.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -3208,7 +3208,8 @@ static int __netif_receive_skb(struct sk_buff *skb)
		list_for_each_entry_rcu(ptype,
		&ptype_base[ntohs(type) & PTYPE_HASH_MASK], list) {
		if (ptype->type == type &&
		(ptype->dev == null_or_dev \|\| ptype->dev == skb->dev)) {
		(ptype->dev == null_or_dev \|\| ptype->dev == skb->dev \|\|
		ptype->dev == orig_dev)) {
		if (pt_prev)
		ret = deliver_skb(skb, pt_prev, orig_dev);
		pt_prev = ptype;