diff options
| author |   Jiri Pirko <jpirko@redhat.com> | 2011-02-28 20:26:31 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2011-03-07 15:37:16 -0800 |
| commit | e3f48d37cf87a4a94e9f05fddc39b0e5f2307c27 (patch) | |
| tree | 83a497ae37eeba362f810e54b533cf9ae034ec9a | |
| parent | be2net: Add multicast filter capability for Lancer (diff) | |
| download | linux-dev-e3f48d37cf87a4a94e9f05fddc39b0e5f2307c27.tar.xz linux-dev-e3f48d37cf87a4a94e9f05fddc39b0e5f2307c27.zip | |
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>
| -rw-r--r-- | net/core/dev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 30440e7b296c..9f66de9c0572 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; |