]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
authorDavid S. Miller <davem@davemloft.net>
Mon, 17 Jun 2013 23:13:45 +0000 (16:13 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 17 Jun 2013 23:13:45 +0000 (16:13 -0700)
commit8cba7dcd5d9447c372321d313e1b6d64626176ea
tree12e29890b5feb323c762abf28d2c1b6ff217c0fa
parent45bd0a6f746a49d94d1f6bd4c7375a3ae006f629
parent5a8c83bd5a06ee393d82c4fe869c36c263551c8a
Merge branch 'master' of git://git.kernel.org/pub/scm/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 <davem@davemloft.net>