From: David S. Miller Date: Wed, 31 Oct 2012 18:54:15 +0000 (-0400) Subject: Merge branch 'master' of git://1984.lsi.us.es/nf X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f8450bbe8c7e94b7ef83e74d270d48e057173ed0;p=openwrt%2Fstaging%2Fblogic.git 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 --- f8450bbe8c7e94b7ef83e74d270d48e057173ed0