diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2013-09-28 17:10:59 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-10-01 00:59:38 -0400 |
commit | 0bbf87d852d243680ed7074110ccc1dea003b61a (patch) | |
tree | 016273c3e3e097096a94b10f590437acbb61ece7 /drivers/net/vxlan.c | |
parent | 56d7b53f47e7c9a0ab1c6289f2669a8d3a65cf17 (diff) |
net ipv4: Convert ipv4.ip_local_port_range to be per netns v3
- Move sysctl_local_ports from a global variable into struct netns_ipv4.
- Modify inet_get_local_port_range to take a struct net, and update all
of the callers.
- Move the initialization of sysctl_local_ports into
sysctl_net_ipv4.c:ipv4_sysctl_init_net from inet_connection_sock.c
v2:
- Ensure indentation used tabs
- Fixed ip.h so it applies cleanly to todays net-next
v3:
- Compile fixes of strange callers of inet_get_local_port_range.
This patch now successfully passes an allmodconfig build.
Removed manual inlining of inet_get_local_port_range in ipv4_local_port_range
Originally-by: Samya <samya@twitter.com>
Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vxlan.c')
-rw-r--r-- | drivers/net/vxlan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index d1292fe746bc..c376be7b528a 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c | |||
@@ -2089,7 +2089,7 @@ static void vxlan_setup(struct net_device *dev) | |||
2089 | vxlan->age_timer.function = vxlan_cleanup; | 2089 | vxlan->age_timer.function = vxlan_cleanup; |
2090 | vxlan->age_timer.data = (unsigned long) vxlan; | 2090 | vxlan->age_timer.data = (unsigned long) vxlan; |
2091 | 2091 | ||
2092 | inet_get_local_port_range(&low, &high); | 2092 | inet_get_local_port_range(dev_net(dev), &low, &high); |
2093 | vxlan->port_min = low; | 2093 | vxlan->port_min = low; |
2094 | vxlan->port_max = high; | 2094 | vxlan->port_max = high; |
2095 | vxlan->dst_port = htons(vxlan_port); | 2095 | vxlan->dst_port = htons(vxlan_port); |