diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2013-09-28 23:10:59 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-10-01 06:59:38 +0200 |
| commit | 0bbf87d852d243680ed7074110ccc1dea003b61a (patch) | |
| tree | 016273c3e3e097096a94b10f590437acbb61ece7 /net/openvswitch/vport-vxlan.c | |
| parent | ethernet: use likely() for common Ethernet encap (diff) | |
| download | linux-0bbf87d852d243680ed7074110ccc1dea003b61a.tar.xz linux-0bbf87d852d243680ed7074110ccc1dea003b61a.zip | |
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 'net/openvswitch/vport-vxlan.c')
| -rw-r--r-- | net/openvswitch/vport-vxlan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/vport-vxlan.c b/net/openvswitch/vport-vxlan.c index a481c03e2861..56e22b74cf96 100644 --- a/net/openvswitch/vport-vxlan.c +++ b/net/openvswitch/vport-vxlan.c @@ -173,7 +173,7 @@ static int vxlan_tnl_send(struct vport *vport, struct sk_buff *skb) skb->local_df = 1; - inet_get_local_port_range(&port_min, &port_max); + inet_get_local_port_range(net, &port_min, &port_max); src_port = vxlan_src_port(port_min, port_max, skb); err = vxlan_xmit_skb(vxlan_port->vs, rt, skb, |