From: David S. Miller Date: Mon, 17 Jun 2013 23:13:45 +0000 (-0700) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf X-Git-Tag: v3.12-rc1~580^2~42 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e00c7f1fad21ff81ac0a8dfbbb7cc3b7c806fa73;p=kernel%2Fkernel-generic.git Merge branch 'master' of git://git./linux/kernel/git/pablo/nf Pablo Neira Ayuso says: ==================== The following patchset contains Netfilter fixes. They are targeted to the TCP option targets, that have receive some scrinity in the last week. The changes are: * Fix TCPOPTSTRIP, it stopped working in the forward chain as tcp_hdr uses skb->transport_header, and we cannot use that in the forwarding case, from myself. * Fix default IPv6 MSS in TCPMSS in case of absence of TCP MSS options, from Phil Oester. * Fix missing fragmentation handling again in TCPMSS, from Phil Oester. ==================== Signed-off-by: David S. Miller --- e00c7f1fad21ff81ac0a8dfbbb7cc3b7c806fa73