| Message ID | 20110301062631.GC2855@psychotron.redhat.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
ou, forgot [PATCH net-next-2.6] - sorry Tue, Mar 01, 2011 at 07:26:31AM CET, jpirko@redhat.com wrote: >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> >--- > 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 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; >-- >1.7.3.4 > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Le 01/03/2011 07:26, Jiri Pirko a écrit : > This was there before, I forgot about this. Allows deliveries to > ptype_base handlers registered for orig_dev. I presume this is still > desired. Yes, it is. Sorry for missing it in my review. > Signed-off-by: Jiri Pirko<jpirko@redhat.com> Reviewed-by: Nicolas de Pesloüan <nicolas.2p.debian@free.fr> > --- > 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 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; -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Nicolas de Pesloüan <nicolas.2p.debian@gmail.com> Date: Tue, 01 Mar 2011 09:24:19 +0100 > Le 01/03/2011 07:26, Jiri Pirko a écrit : >> This was there before, I forgot about this. Allows deliveries to >> ptype_base handlers registered for orig_dev. I presume this is still >> desired. > > Yes, it is. Sorry for missing it in my review. > >> Signed-off-by: Jiri Pirko<jpirko@redhat.com> > > Reviewed-by: Nicolas de Pesloüan <nicolas.2p.debian@free.fr> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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;
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> --- net/core/dev.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)