* net: allow handlers to be processed for orig_dev
@ 2011-03-01 6:26 Jiri Pirko
2011-03-01 6:43 ` Jiri Pirko
2011-03-01 8:24 ` Nicolas de Pesloüan
0 siblings, 2 replies; 4+ messages in thread
From: Jiri Pirko @ 2011-03-01 6:26 UTC (permalink / raw)
To: netdev
Cc: davem, shemminger, kaber, fubar, eric.dumazet, nicolas.2p.debian,
andy
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: net: allow handlers to be processed for orig_dev
2011-03-01 6:26 net: allow handlers to be processed for orig_dev Jiri Pirko
@ 2011-03-01 6:43 ` Jiri Pirko
2011-03-01 8:24 ` Nicolas de Pesloüan
1 sibling, 0 replies; 4+ messages in thread
From: Jiri Pirko @ 2011-03-01 6:43 UTC (permalink / raw)
To: netdev; +Cc: davem
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
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: net: allow handlers to be processed for orig_dev
2011-03-01 6:26 net: allow handlers to be processed for orig_dev Jiri Pirko
2011-03-01 6:43 ` Jiri Pirko
@ 2011-03-01 8:24 ` Nicolas de Pesloüan
2011-03-07 23:37 ` David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Nicolas de Pesloüan @ 2011-03-01 8:24 UTC (permalink / raw)
To: Jiri Pirko; +Cc: netdev, davem, shemminger, kaber, fubar, eric.dumazet, andy
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;
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: net: allow handlers to be processed for orig_dev
2011-03-01 8:24 ` Nicolas de Pesloüan
@ 2011-03-07 23:37 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2011-03-07 23:37 UTC (permalink / raw)
To: nicolas.2p.debian
Cc: jpirko, netdev, shemminger, kaber, fubar, eric.dumazet, andy
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-03-07 23:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-01 6:26 net: allow handlers to be processed for orig_dev Jiri Pirko
2011-03-01 6:43 ` Jiri Pirko
2011-03-01 8:24 ` Nicolas de Pesloüan
2011-03-07 23:37 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).