From a9bf2c02c5a902307e39f9099e9a787651289867 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Sun, 23 Nov 2008 15:42:23 -0800 Subject: [PATCH] --- yaml --- r: 122098 b: refs/heads/master c: 04f258ce7f085dd69422fa01d41c8f0194a0e270 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv4/af_inet.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 3a3e08a1d621..48ac8a51f301 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c46920dadba65856eb1a1f1ffa1b350875db1228 +refs/heads/master: 04f258ce7f085dd69422fa01d41c8f0194a0e270 diff --git a/trunk/net/ipv4/af_inet.c b/trunk/net/ipv4/af_inet.c index b1462e8c64cf..fe03048c130d 100644 --- a/trunk/net/ipv4/af_inet.c +++ b/trunk/net/ipv4/af_inet.c @@ -245,7 +245,7 @@ static inline int inet_netns_ok(struct net *net, int protocol) int hash; struct net_protocol *ipprot; - if (net == &init_net) + if (net_eq(net, &init_net)) return 1; hash = protocol & (MAX_INET_PROTOS - 1); @@ -272,10 +272,9 @@ static int inet_create(struct net *net, struct socket *sock, int protocol) int try_loading_module = 0; int err; - if (sock->type != SOCK_RAW && - sock->type != SOCK_DGRAM && - !inet_ehash_secret) - build_ehash_secret(); + if (unlikely(!inet_ehash_secret)) + if (sock->type != SOCK_RAW && sock->type != SOCK_DGRAM) + build_ehash_secret(); sock->state = SS_UNCONNECTED;