diff options
author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2008-07-20 01:34:43 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-20 01:34:43 -0400 |
commit | 721499e8931c5732202481ae24f2dfbf9910f129 (patch) | |
tree | c94d8d681966109bb41f712f21f3a9825ae2172d /net/ipv4/ipconfig.c | |
parent | 407d819cf0fd54c6fc1138a509225696aecafd15 (diff) |
netns: Use net_eq() to compare net-namespaces for optimization.
Without CONFIG_NET_NS, namespace is always &init_net.
Compiler will be able to omit namespace comparisons with this patch.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipconfig.c')
-rw-r--r-- | net/ipv4/ipconfig.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index b88aa9afa42e..42065fff46c4 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c | |||
@@ -432,7 +432,7 @@ ic_rarp_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt | |||
432 | unsigned char *sha, *tha; /* s for "source", t for "target" */ | 432 | unsigned char *sha, *tha; /* s for "source", t for "target" */ |
433 | struct ic_device *d; | 433 | struct ic_device *d; |
434 | 434 | ||
435 | if (dev_net(dev) != &init_net) | 435 | if (!net_eq(dev_net(dev), &init_net)) |
436 | goto drop; | 436 | goto drop; |
437 | 437 | ||
438 | if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) | 438 | if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) |
@@ -852,7 +852,7 @@ static int __init ic_bootp_recv(struct sk_buff *skb, struct net_device *dev, str | |||
852 | struct ic_device *d; | 852 | struct ic_device *d; |
853 | int len, ext_len; | 853 | int len, ext_len; |
854 | 854 | ||
855 | if (dev_net(dev) != &init_net) | 855 | if (!net_eq(dev_net(dev), &init_net)) |
856 | goto drop; | 856 | goto drop; |
857 | 857 | ||
858 | /* Perform verifications before taking the lock. */ | 858 | /* Perform verifications before taking the lock. */ |