Commit 04f258ce authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

net: some optimizations in af_inet

1) Use eq_net() in inet_netns_ok() to speedup socket creation if
   !CONFIG_NET_NS

2) Reorder the tests about inet_ehash_secret generation (once only)
   Use the unlikely() macro when testing if inet_ehash_secret already
   generated.
Signed-off-by: default avatarEric Dumazet <dada1@cosmosbay.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c46920da
...@@ -245,7 +245,7 @@ static inline int inet_netns_ok(struct net *net, int protocol) ...@@ -245,7 +245,7 @@ static inline int inet_netns_ok(struct net *net, int protocol)
int hash; int hash;
struct net_protocol *ipprot; struct net_protocol *ipprot;
if (net == &init_net) if (net_eq(net, &init_net))
return 1; return 1;
hash = protocol & (MAX_INET_PROTOS - 1); hash = protocol & (MAX_INET_PROTOS - 1);
...@@ -272,9 +272,8 @@ static int inet_create(struct net *net, struct socket *sock, int protocol) ...@@ -272,9 +272,8 @@ static int inet_create(struct net *net, struct socket *sock, int protocol)
int try_loading_module = 0; int try_loading_module = 0;
int err; int err;
if (sock->type != SOCK_RAW && if (unlikely(!inet_ehash_secret))
sock->type != SOCK_DGRAM && if (sock->type != SOCK_RAW && sock->type != SOCK_DGRAM)
!inet_ehash_secret)
build_ehash_secret(); build_ehash_secret();
sock->state = SS_UNCONNECTED; sock->state = SS_UNCONNECTED;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment