diff options
| author | David S. Miller <davem@davemloft.net> | 2013-06-17 16:13:45 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-17 16:13:45 -0700 |
| commit | e00c7f1fad21ff81ac0a8dfbbb7cc3b7c806fa73 (patch) | |
| tree | 12e29890b5feb323c762abf28d2c1b6ff217c0fa /net/mac80211/mlme.c | |
| parent | ab69bde6b2e9c37456eeb0051a185446336aef9f (diff) | |
| parent | b396966c4688522863572927cb30aa874b3ec504 (diff) | |
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>
Diffstat (limited to 'net/mac80211/mlme.c')
0 files changed, 0 insertions, 0 deletions