diff options
| author | Vasiliy Kulikov <segoon@openwall.com> | 2011-05-17 00:16:56 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-17 14:16:58 -0400 |
| commit | f56e03e8dc149bf0ac2888d6843584f48c8700fc (patch) | |
| tree | 071864cd821423ff1caf06d824823b533cbcab77 /net | |
| parent | 6dcae1eaee2b437536b2fe928a609f9589691ebf (diff) | |
| download | linux-3.10-f56e03e8dc149bf0ac2888d6843584f48c8700fc.tar.gz linux-3.10-f56e03e8dc149bf0ac2888d6843584f48c8700fc.tar.bz2 linux-3.10-f56e03e8dc149bf0ac2888d6843584f48c8700fc.zip | |
net: ping: fix build failure
If CONFIG_PROC_SYSCTL=n the building process fails:
ping.c:(.text+0x52af3): undefined reference to `inet_get_ping_group_range_net'
Moved inet_get_ping_group_range_net() to ping.c.
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/ping.c | 13 | ||||
| -rw-r--r-- | net/ipv4/sysctl_net_ipv4.c | 12 |
2 files changed, 13 insertions, 12 deletions
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index 41836ab6c20..6a21da90653 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -187,6 +187,19 @@ exit: return sk; } +static void inet_get_ping_group_range_net(struct net *net, gid_t *low, gid_t *high) +{ + gid_t *data = net->ipv4.sysctl_ping_group_range; + unsigned seq; + do { + seq = read_seqbegin(&sysctl_local_ports.lock); + + *low = data[0]; + *high = data[1]; + } while (read_seqretry(&sysctl_local_ports.lock, seq)); +} + + static int ping_init_sock(struct sock *sk) { struct net *net = sock_net(sk); diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c index 28e8273bbef..57d0752e239 100644 --- a/net/ipv4/sysctl_net_ipv4.c +++ b/net/ipv4/sysctl_net_ipv4.c @@ -73,18 +73,6 @@ static int ipv4_local_port_range(ctl_table *table, int write, } -void inet_get_ping_group_range_net(struct net *net, gid_t *low, gid_t *high) -{ - gid_t *data = net->ipv4.sysctl_ping_group_range; - unsigned seq; - do { - seq = read_seqbegin(&sysctl_local_ports.lock); - - *low = data[0]; - *high = data[1]; - } while (read_seqretry(&sysctl_local_ports.lock, seq)); -} - void inet_get_ping_group_range_table(struct ctl_table *table, gid_t *low, gid_t *high) { gid_t *data = table->data; |