summaryrefslogtreecommitdiff
path: root/net/ipv4/gre.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-10-31 14:54:15 -0400
committerDavid S. Miller <davem@davemloft.net>2012-10-31 14:54:15 -0400
commitf8450bbe8c7e94b7ef83e74d270d48e057173ed0 (patch)
treeb3717a754de855a9186f31635da345ec710beee3 /net/ipv4/gre.c
parent3c172868cbbe3eb138fd57bb346c77dffb22b182 (diff)
parentf1df1374dc83d62588667e566e959df384718ad1 (diff)
Merge branch 'master' of git://1984.lsi.us.es/nf
Pablo Neira Ayuso says: ==================== The following patchset contains fixes for your net tree, two of them are due to relatively recent changes, one has been a longstanding bug, they are: * Fix incorrect usage of rt_gateway in the H.323 helper, from Julian Anastasov. * Skip re-route in nf_nat code for ICMP traffic. If CONFIG_XFRM is enabled, we waste cycles to look up for the route again. This problem seems to be there since really long time. From Ulrich Weber. * Fix mismatching section in nf_conntrack_reasm, from Hein Tibosch. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/gre.c')
0 files changed, 0 insertions, 0 deletions