aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/marvell/skge.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-06-18 16:07:31 -0700
committerDavid S. Miller <davem@davemloft.net>2014-06-18 16:08:40 -0700
commit3a3ec1b2badc914e008fe3aefb01db31258dd960 (patch)
treee21b5c057f408aa77bbfbd5631a6017b4b1fa1a7 /drivers/net/ethernet/marvell/skge.c
parentnet: fec: Don't clear IPV6 header checksum field when IP accelerator enable (diff)
parentMAINTAINERS: merge ebtables into netfilter entry (diff)
downloadlinux-dev-3a3ec1b2badc914e008fe3aefb01db31258dd960.tar.xz
linux-dev-3a3ec1b2badc914e008fe3aefb01db31258dd960.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says: ==================== netfilter fixes for net The following patchset contains netfilter updates for your net tree, they are: 1) Fix refcount leak when dumping the dying/unconfirmed conntrack lists, from Florian Westphal. 2) Fix crash in NAT when removing a netnamespace, also from Florian. 3) Fix a crash in IPVS when trying to remove an estimator out of the sysctl scope, from Julian Anastasov. 4) Add zone attribute to the routing to calculate the message size in ctnetlink events, from Ken-ichirou MATSUZAWA. 5) Another fix for the dying/unconfirmed list which was preventing to dump more than one memory page of entries (~17 entries in x86_64). 6) Fix missing RCU-safe list insertion in the rule replacement code in nf_tables. 7) Since the new transaction infrastructure is in place, we have to upgrade the chain use counter from u16 to u32 to avoid overflow after more than 2^16 rules are added. 8) Fix refcount leak when replacing rule in nf_tables. This problem was also introduced in new transaction. 9) Call the ->destroy() callback when releasing nft-xt rules to fix module refcount leaks. 10) Set the family in the netlink messages that contain set elements in nf_tables to make it consistent with other object types. 11) Don't dump NAT port information if it is unset in nft_nat. 12) Update the MAINTAINERS file, I have merged the ebtables entry into netfilter. While at it, also removed the netfilter users mailing list, the development list should be enough. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell/skge.c')
0 files changed, 0 insertions, 0 deletions