leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
b633353115
linux/drivers/net/ethernet/broadcom/bnx2x
History
David S. Miller b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/phy/bcm7xxx.c
	drivers/net/phy/marvell.c
	drivers/net/vxlan.c

All three conflicts were cases of simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-02-23 00:09:14 -05:00
..
bnx2x_cmn.c net: rework setup_tc ndo op to consume general tc operand 2016-02-17 09:47:35 -05:00
bnx2x_cmn.h net: rework setup_tc ndo op to consume general tc operand 2016-02-17 09:47:35 -05:00
bnx2x_dcb.c bnx2x: extend DCBx support 2016-02-16 20:12:16 -05:00
bnx2x_dcb.h bnx2x: Rebrand from 'broadcom' into 'qlogic' 2015-07-22 10:47:26 -07:00
bnx2x_dump.h bnx2x: Rebrand from 'broadcom' into 'qlogic' 2015-07-22 10:47:26 -07:00
bnx2x_ethtool.c bnx2x: Warn about grc timeouts in register dump 2016-02-16 20:12:16 -05:00
bnx2x_fw_defs.h bnx2x: Rebrand from 'broadcom' into 'qlogic' 2015-07-22 10:47:26 -07:00
bnx2x_fw_file_hdr.h bnx2x: Rebrand from 'broadcom' into 'qlogic' 2015-07-22 10:47:26 -07:00
bnx2x_hsi.h bnx2x: Add missing HSI for big-endian machines 2016-02-18 23:33:23 -05:00
bnx2x_init_ops.h bnx2x: Rebrand from 'broadcom' into 'qlogic' 2015-07-22 10:47:26 -07:00
bnx2x_init.h bnx2x: Rebrand from 'broadcom' into 'qlogic' 2015-07-22 10:47:26 -07:00
bnx2x_link.c bnx2x: Fix 84833 phy command handler 2016-02-21 22:50:55 -05:00
bnx2x_link.h bnx2x: Rebrand from 'broadcom' into 'qlogic' 2015-07-22 10:47:26 -07:00
bnx2x_main.c net: rework ndo tc op to consume additional qdisc handle parameter 2016-02-17 09:47:35 -05:00
bnx2x_mfw_req.h bnx2x: Rebrand from 'broadcom' into 'qlogic' 2015-07-22 10:47:26 -07:00
bnx2x_reg.h bnx2x: Fix 84833 phy command handler 2016-02-21 22:50:55 -05:00
bnx2x_sp.c bnx2x: byte swap rss_key to comply to Toeplitz specs 2015-09-24 14:34:49 -07:00
bnx2x_sp.h bnx2x: add vlan filtering offload 2015-07-29 23:24:45 -07:00
bnx2x_sriov.c bnx2x: Correct logic for pvid configuration. 2015-08-02 17:18:24 -07:00
bnx2x_sriov.h bnx2x: Fix compilation when CONFIG_BNX2X_SRIOV is not set 2015-07-30 09:52:18 -07:00
bnx2x_stats.c bnx2x: Rebrand from 'broadcom' into 'qlogic' 2015-07-22 10:47:26 -07:00
bnx2x_stats.h bnx2x: Rebrand from 'broadcom' into 'qlogic' 2015-07-22 10:47:26 -07:00
bnx2x_vfpf.c bnx2x: add vlan filtering offload 2015-07-29 23:24:45 -07:00
bnx2x_vfpf.h bnx2x: add vlan filtering offload 2015-07-29 23:24:45 -07:00
bnx2x.h bnx2x: Add Geneve inner-RSS support 2016-02-16 20:12:16 -05:00
Makefile bnx2x: Segregate SR-IOV code 2013-01-07 19:49:14 -08:00