From: Jiri Pirko <jpirko@redhat.com>
Date: Mon, 28 Feb 2011 20:26:31 +0000 (+0000)
Subject: net: allow handlers to be processed for orig_dev
X-Git-Tag: v2.6.39-rc1~468^2~140
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e3f48d37cf87a4a94e9f05fddc39b0e5f2307c27;p=platform%2Fkernel%2Flinux-3.10.git

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>
---

diff --git a/net/core/dev.c b/net/core/dev.c
index 30440e7..9f66de9 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3208,7 +3208,8 @@ ncls:
 	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;