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

Commit e3f48d37 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

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: default avatarJiri Pirko <jpirko@redhat.com>
Reviewed-by: default avatarNicolas de Pesloüan <nicolas.2p.debian@free.fr>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f21b538c
Loading
Loading
Loading
Loading
+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;