net: allow handlers to be processed for orig_dev
authorJiri Pirko <jpirko@redhat.com>
Mon, 28 Feb 2011 20:26:31 +0000 (20:26 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 7 Mar 2011 23:37:16 +0000 (15:37 -0800)
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>
net/core/dev.c

index 30440e7..9f66de9 100644 (file)
@@ -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;