diff options
| author | David S. Miller <davem@davemloft.net> | 2012-09-13 20:24:31 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-13 20:24:31 +0200 |
| commit | b0e61d98c672a9216d72d2d7430f6dc60795002e (patch) | |
| tree | e3df3834c08ce75b63aa1f21ac31e483f273495b /drivers/net/ethernet/broadcom | |
| parent | x86 bpf_jit: support MOD operation (diff) | |
| parent | netfilter: ctnetlink: fix module auto-load in ctnetlink_parse_nat (diff) | |
| download | linux-b0e61d98c672a9216d72d2d7430f6dc60795002e.tar.xz linux-b0e61d98c672a9216d72d2d7430f6dc60795002e.zip | |
Merge branch 'master' of git://1984.lsi.us.es/nf-next
Pablo Neira Ayuso says:
====================
The following patchset contains four Netfilter updates, mostly targeting
to fix issues added with IPv6 NAT, and one little IPVS update for net-next:
* Remove unneeded conditional free of skb in nfnetlink_queue, from
Wei Yongjun.
* One semantic path from coccinelle detected the use of list_del +
INIT_LIST_HEAD, instead of list_del_init, again from Wei Yongjun.
* Fix out-of-bound memory access in the NAT address selection, from
Florian Westphal. This was introduced with the IPv6 NAT patches.
* Two fixes for crashes that were introduced in the recently merged
IPv6 NAT support, from myself.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom')
0 files changed, 0 insertions, 0 deletions