diff options
| author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2008-07-19 22:34:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-19 22:34:43 -0700 |
| commit | 721499e8931c5732202481ae24f2dfbf9910f129 (patch) | |
| tree | c94d8d681966109bb41f712f21f3a9825ae2172d /net/bridge | |
| parent | 407d819cf0fd54c6fc1138a509225696aecafd15 (diff) | |
| download | kernel_samsung_aries-721499e8931c5732202481ae24f2dfbf9910f129.zip kernel_samsung_aries-721499e8931c5732202481ae24f2dfbf9910f129.tar.gz kernel_samsung_aries-721499e8931c5732202481ae24f2dfbf9910f129.tar.bz2 | |
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/bridge')
| -rw-r--r-- | net/bridge/br_notify.c | 2 | ||||
| -rw-r--r-- | net/bridge/br_stp_bpdu.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_notify.c b/net/bridge/br_notify.c index 88d8ec7b..76340bd 100644 --- a/net/bridge/br_notify.c +++ b/net/bridge/br_notify.c @@ -35,7 +35,7 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v struct net_bridge_port *p = dev->br_port; struct net_bridge *br; - if (dev_net(dev) != &init_net) + if (!net_eq(dev_net(dev), &init_net)) return NOTIFY_DONE; /* not a port of a bridge */ diff --git a/net/bridge/br_stp_bpdu.c b/net/bridge/br_stp_bpdu.c index 9964761..8b200f9 100644 --- a/net/bridge/br_stp_bpdu.c +++ b/net/bridge/br_stp_bpdu.c @@ -140,7 +140,7 @@ void br_stp_rcv(const struct stp_proto *proto, struct sk_buff *skb, struct net_bridge *br; const unsigned char *buf; - if (dev_net(dev) != &init_net) + if (!net_eq(dev_net(dev), &init_net)) goto err; if (!p) |