* [PATCH] netpoll: fix the skb check in pkt_is_ns
@ 2014-03-17 8:53 roy.qing.li
2014-03-18 0:05 ` Li RongQing
0 siblings, 1 reply; 6+ messages in thread
From: roy.qing.li @ 2014-03-17 8:53 UTC (permalink / raw)
To: netdev; +Cc: amwang
From: Li RongQing <roy.qing.li@gmail.com>
Neighbor Solicitation is ipv6 protocol, so we should check
skb->protocol with ETH_P_IPV6
Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
Cc: WANG Cong <amwang@redhat.com>
---
net/core/netpoll.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 570eb40..159f160 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -742,7 +742,7 @@ static bool pkt_is_ns(struct sk_buff *skb)
struct nd_msg *msg;
struct ipv6hdr *hdr;
- if (skb->protocol != htons(ETH_P_ARP))
+ if (skb->protocol != htons(ETH_P_IPV6))
return false;
if (!pskb_may_pull(skb, sizeof(struct ipv6hdr) + sizeof(struct nd_msg)))
return false;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] netpoll: fix the skb check in pkt_is_ns
2014-03-17 8:53 roy.qing.li
@ 2014-03-18 0:05 ` Li RongQing
0 siblings, 0 replies; 6+ messages in thread
From: Li RongQing @ 2014-03-18 0:05 UTC (permalink / raw)
To: netdev; +Cc: Cong Wang
this patch can be dropped since other patch has been merged into
net-next[netpoll: Remove dead packet receive code
(CONFIG_NETPOLL_TRAP)]
On Mon, Mar 17, 2014 at 4:53 PM, <roy.qing.li@gmail.com> wrote:
> From: Li RongQing <roy.qing.li@gmail.com>
>
> Neighbor Solicitation is ipv6 protocol, so we should check
> skb->protocol with ETH_P_IPV6
>
> Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
> Cc: WANG Cong <amwang@redhat.com>
> ---
> net/core/netpoll.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/core/netpoll.c b/net/core/netpoll.c
> index 570eb40..159f160 100644
> --- a/net/core/netpoll.c
> +++ b/net/core/netpoll.c
> @@ -742,7 +742,7 @@ static bool pkt_is_ns(struct sk_buff *skb)
> struct nd_msg *msg;
> struct ipv6hdr *hdr;
>
> - if (skb->protocol != htons(ETH_P_ARP))
> + if (skb->protocol != htons(ETH_P_IPV6))
> return false;
> if (!pskb_may_pull(skb, sizeof(struct ipv6hdr) + sizeof(struct nd_msg)))
> return false;
> --
> 1.7.10.4
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] netpoll: fix the skb check in pkt_is_ns
@ 2014-03-21 12:53 roy.qing.li
2014-03-21 16:47 ` Cong Wang
2014-03-24 19:09 ` David Miller
0 siblings, 2 replies; 6+ messages in thread
From: roy.qing.li @ 2014-03-21 12:53 UTC (permalink / raw)
To: netdev, amwang
From: Li RongQing <roy.qing.li@gmail.com>
Neighbor Solicitation is ipv6 protocol, so we should check
skb->protocol with ETH_P_IPV6
Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
Cc: WANG Cong <amwang@redhat.com>
---
net/core/netpoll.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index a664f78..df9e6b1 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -742,7 +742,7 @@ static bool pkt_is_ns(struct sk_buff *skb)
struct nd_msg *msg;
struct ipv6hdr *hdr;
- if (skb->protocol != htons(ETH_P_ARP))
+ if (skb->protocol != htons(ETH_P_IPV6))
return false;
if (!pskb_may_pull(skb, sizeof(struct ipv6hdr) + sizeof(struct nd_msg)))
return false;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] netpoll: fix the skb check in pkt_is_ns
2014-03-21 12:53 [PATCH] netpoll: fix the skb check in pkt_is_ns roy.qing.li
@ 2014-03-21 16:47 ` Cong Wang
2014-03-22 0:24 ` Li RongQing
2014-03-24 19:09 ` David Miller
1 sibling, 1 reply; 6+ messages in thread
From: Cong Wang @ 2014-03-21 16:47 UTC (permalink / raw)
To: roy.qing.li; +Cc: netdev, Cong Wang
On Fri, Mar 21, 2014 at 5:53 AM, <roy.qing.li@gmail.com> wrote:
> diff --git a/net/core/netpoll.c b/net/core/netpoll.c
> index a664f78..df9e6b1 100644
> --- a/net/core/netpoll.c
> +++ b/net/core/netpoll.c
> @@ -742,7 +742,7 @@ static bool pkt_is_ns(struct sk_buff *skb)
> struct nd_msg *msg;
> struct ipv6hdr *hdr;
>
> - if (skb->protocol != htons(ETH_P_ARP))
> + if (skb->protocol != htons(ETH_P_IPV6))
But this code was just removed by:
commit 9c62a68d13119a1ca9718381d97b0cb415ff4e9d
Author: Eric W. Biederman <ebiederm@xmission.com>
Date: Fri Mar 14 20:51:52 2014 -0700
netpoll: Remove dead packet receive code (CONFIG_NETPOLL_TRAP)
Or your patch is for -net? But CONFIG_NETPOLL_TRAP doesn't
have any in-tree users, so we probably don't care.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] netpoll: fix the skb check in pkt_is_ns
2014-03-21 16:47 ` Cong Wang
@ 2014-03-22 0:24 ` Li RongQing
0 siblings, 0 replies; 6+ messages in thread
From: Li RongQing @ 2014-03-22 0:24 UTC (permalink / raw)
To: Cong Wang; +Cc: netdev, Cong Wang
On Sat, Mar 22, 2014 at 12:47 AM, Cong Wang <cwang@twopensource.com> wrote:
> But this code was just removed by:
>
> commit 9c62a68d13119a1ca9718381d97b0cb415ff4e9d
> Author: Eric W. Biederman <ebiederm@xmission.com>
> Date: Fri Mar 14 20:51:52 2014 -0700
>
> netpoll: Remove dead packet receive code (CONFIG_NETPOLL_TRAP)
>
>
> Or your patch is for -net? But CONFIG_NETPOLL_TRAP doesn't
> have any in-tree users, so we probably don't care
Yes, for net;
This bug is so dazzle before 9c62a68d13119a1ca9718381d97b0cb415ff4e9d
is merged into net
-Roy
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] netpoll: fix the skb check in pkt_is_ns
2014-03-21 12:53 [PATCH] netpoll: fix the skb check in pkt_is_ns roy.qing.li
2014-03-21 16:47 ` Cong Wang
@ 2014-03-24 19:09 ` David Miller
1 sibling, 0 replies; 6+ messages in thread
From: David Miller @ 2014-03-24 19:09 UTC (permalink / raw)
To: roy.qing.li; +Cc: netdev, amwang
From: roy.qing.li@gmail.com
Date: Fri, 21 Mar 2014 20:53:57 +0800
> From: Li RongQing <roy.qing.li@gmail.com>
>
> Neighbor Solicitation is ipv6 protocol, so we should check
> skb->protocol with ETH_P_IPV6
>
> Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
Applied to 'net' and queued up for -stable.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-03-24 19:09 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-21 12:53 [PATCH] netpoll: fix the skb check in pkt_is_ns roy.qing.li
2014-03-21 16:47 ` Cong Wang
2014-03-22 0:24 ` Li RongQing
2014-03-24 19:09 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2014-03-17 8:53 roy.qing.li
2014-03-18 0:05 ` Li RongQing
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).