aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_options.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-12-26 13:38:26 -0500
committerDavid S. Miller <davem@davemloft.net>2013-12-26 13:38:26 -0500
commitf55b0821b92ee31c440a4a278b2b0fec7ae92bd1 (patch)
tree543b73681f8d1587f578e6c8790312503f781edc /net/ipv4/ip_options.c
parentMerge branch 'addr_compare' (diff)
parentbnx2x: add VF Multicast filters support (diff)
downloadlinux-dev-f55b0821b92ee31c440a4a278b2b0fec7ae92bd1.tar.xz
linux-dev-f55b0821b92ee31c440a4a278b2b0fec7ae92bd1.zip
Merge branch 'bnx2x'
Yuval Mintz says: ==================== bnx2x: new features patch series This patch series adds/fixes several new features in the bnx2x driver - it adds support for loading the bnx2x over an UNDI running on a Multi-function device, adds missing bits for PCIe AER support and enables VFs to properly configure multicast filters (In addition, it also contains some small improvements in driver behaviour). Please consider applying these patches to `net-next'. Changes from previous versions ------------------------------ v2: - Fixed comment typo in patch 4 (propogate --> propagate) ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_options.c')
0 files changed, 0 insertions, 0 deletions