summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/neterion/vxge/vxge-ethtool.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-02-27 09:17:43 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-27 09:17:43 -0500
commit4ca257eed6adf58d325c39c320a06dbcd34c43db (patch)
treed9fd5197a37746f4b0622ed162dccc26a8f26519 /drivers/net/ethernet/neterion/vxge/vxge-ethtool.c
parent51fb60eb162ab84c5edf2ae9c63cf0b878e5547e (diff)
parent13aa5a8f498dacd5f1a8e35be72af47e630fb8c6 (diff)
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 fixes for you net tree, they are: 1) Missing ct zone size in the nft_ct initialization path, patch from Florian Westphal. 2) Two patches for netfilter uapi headers, one to remove unnecessary sysctl.h inclusion and another to fix compilation of xt_hashlimit.h in userspace, from Dmitry V. Levin. 3) Patch to fix a sloppy change in nf_ct_expect that incorrectly simplified nf_ct_expect_related_report() in the previous nf-next batch. This also includes another patch for __nf_ct_expect_check() to report success by returning 0 to keep it consistent with other existing functions. From Jarno Rajahalme. 4) The ->walk() iterator of the new bitmap set type goes over the real bitmap size, this results in incorrect dumps when NFTA_SET_USERDATA is used. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/neterion/vxge/vxge-ethtool.c')
0 files changed, 0 insertions, 0 deletions