]> git.openpandora.org Git - pandora-kernel.git/commitdiff
inet: make no_pmtu_disc per namespace and kill ipv4_config
authorHannes Frederic Sowa <hannes@stressinduktion.org>
Sat, 14 Dec 2013 04:13:38 +0000 (05:13 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 18 Dec 2013 21:58:20 +0000 (16:58 -0500)
The other field in ipv4_config, log_martians, was converted to a
per-interface setting, so we can just remove the whole structure.

Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/ip.h
include/net/netns/ipv4.h
net/ipv4/af_inet.c
net/ipv4/icmp.c
net/ipv4/sysctl_net_ipv4.c
net/ipv4/xfrm4_state.c
net/ipv6/af_inet6.c

Simple merge
Simple merge
Simple merge
diff --cc net/ipv4/icmp.c
Simple merge
Simple merge
Simple merge
Simple merge