diff options
| author |   Cong Wang <xiyou.wangcong@gmail.com> | 2014-05-06 11:02:49 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-05-08 22:50:47 -0400 |
| commit | c9d8f1a64225dfcc2f721d73a5984a2444920744 (patch) | |
| tree | 504650428b82655ca53cc521b854a9b895fc744a /net/ipv4/inet_connection_sock.c | |
| parent | net: mdio: of_mdiobus_register(): fall back to mdiobus_register() for !CONFIG_OF (diff) | |
| download | linux-dev-c9d8f1a64225dfcc2f721d73a5984a2444920744.tar.xz linux-dev-c9d8f1a64225dfcc2f721d73a5984a2444920744.zip | |
ipv4: move local_port_range out of CONFIG_SYSCTL
When CONFIG_SYSCTL is not set, ip_local_port_range should still work,
just that no one can change it. Therefore we should move it out of sysctl_inet.c.
Also, rename it to ->ip_local_ports instead.
Cc: David S. Miller <davem@davemloft.net>
Cc: Francois Romieu <romieu@fr.zoreil.com>
Reported-by: Stefan de Konink <stefan@konink.de>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inet_connection_sock.c')
| -rw-r--r-- | net/ipv4/inet_connection_sock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 0d1e2cb877ec..a56b8e6e866a 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -37,11 +37,11 @@ void inet_get_local_port_range(struct net *net, int *low, int *high) unsigned int seq; do { - seq = read_seqbegin(&net->ipv4.sysctl_local_ports.lock); + seq = read_seqbegin(&net->ipv4.ip_local_ports.lock); - *low = net->ipv4.sysctl_local_ports.range[0]; - *high = net->ipv4.sysctl_local_ports.range[1]; - } while (read_seqretry(&net->ipv4.sysctl_local_ports.lock, seq)); + *low = net->ipv4.ip_local_ports.range[0]; + *high = net->ipv4.ip_local_ports.range[1]; + } while (read_seqretry(&net->ipv4.ip_local_ports.lock, seq)); } EXPORT_SYMBOL(inet_get_local_port_range); |