summaryrefslogtreecommitdiff
path: root/net/netfilter/nf_conntrack_core.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-05-10 00:39:28 -0400
committerDavid S. Miller <davem@davemloft.net>2016-05-10 00:39:28 -0400
commit0e3c82df576aa8d99e5a867f2c8fac43686d10b7 (patch)
tree28d1291b1b37cb866c6afebce23260670f617557 /net/netfilter/nf_conntrack_core.c
parentbfca2eba2adaa9501656f503559a971de6927fa8 (diff)
parentb45bd1d787969d3ae5662a56ed431cd13e3b8b92 (diff)
Merge branch 'ip6-tunnel-tx-fixes'
Tom Herbert says: ==================== ip6: Transmit tunneling fixes Several fixes suggested by Alexander. Tested: Running netperf TCP_STREAM with gretap and keyid configured. Visually verified that MTU is correctly being set. Did not test HW offload (Alexander plese try) ==================== Tested-by: Alexander Duyck <aduyck@mirantis.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_core.c')
0 files changed, 0 insertions, 0 deletions