* [PATCH net-2.6.26][NETNS][ICMP]: Build fix for NET_NS=n case (dev->nd_net is omitted).
@ 2008-03-26 9:16 Pavel Emelyanov
2008-03-26 9:19 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Pavel Emelyanov @ 2008-03-26 9:16 UTC (permalink / raw)
To: David Miller; +Cc: Linux Netdev List
I didn't check the kernel build after pulling dev->nd_net access
optimization from net-2.6.26 tree :(
Sorry.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
---
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 7049b3f..3697e05 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -821,7 +821,7 @@ static void icmp_echo(struct sk_buff *skb)
{
struct net *net;
- net = skb->dst->dev->nd_net;
+ net = dev_net(skb->dst->dev);
if (!net->ipv4.sysctl_icmp_echo_ignore_all) {
struct icmp_bxm icmp_param;
@@ -1027,7 +1027,7 @@ int icmp_rcv(struct sk_buff *skb)
if (rt->rt_flags & (RTCF_BROADCAST | RTCF_MULTICAST)) {
struct net *net;
- net = rt->u.dst.dev->nd_net;
+ net = dev_net(rt->u.dst.dev);
/*
* RFC 1122: 3.2.2.6 An ICMP_ECHO to broadcast MAY be
* silently ignored (we let user decide with a sysctl).
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-2.6.26][NETNS][ICMP]: Build fix for NET_NS=n case (dev->nd_net is omitted).
2008-03-26 9:16 [PATCH net-2.6.26][NETNS][ICMP]: Build fix for NET_NS=n case (dev->nd_net is omitted) Pavel Emelyanov
@ 2008-03-26 9:19 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2008-03-26 9:19 UTC (permalink / raw)
To: xemul; +Cc: netdev
From: Pavel Emelyanov <xemul@openvz.org>
Date: Wed, 26 Mar 2008 12:16:07 +0300
> I didn't check the kernel build after pulling dev->nd_net access
> optimization from net-2.6.26 tree :(
>
> Sorry.
>
> Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-03-26 9:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-26 9:16 [PATCH net-2.6.26][NETNS][ICMP]: Build fix for NET_NS=n case (dev->nd_net is omitted) Pavel Emelyanov
2008-03-26 9:19 ` 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).