hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
linux-sg2042/drivers/net/ethernet/mellanox/mlx4
History
David S. Miller 32efe08d77 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c

Small minor conflict in bnx2x, wherein one commit changed how
statistics were stored in software, and another commit
fixed endianness bugs wrt. reading the values provided by
the chip in memory.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2012-02-19 16:03:15 -05:00
..
Kconfig
…
Makefile mlx4_core: resource tracking for HCA resources used by guests 2011-12-13 13:56:07 -05:00
alloc.c
…
catas.c mlx4_core: adjust catas operation for SRIOV mode 2011-12-13 13:56:08 -05:00
cmd.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-02-10 23:32:28 -05:00
cq.c mlx4_core: removed function index from vf. 2012-01-22 15:08:43 -05:00
en_cq.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-01-02 18:56:49 -05:00
en_ethtool.c mlx4_en: eth statistics modification 2012-01-22 15:08:43 -05:00
en_main.c mlx4_en: set number of rx rings used by RSS using ethtool 2012-01-18 16:07:34 -05:00
en_netdev.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-02-10 23:32:28 -05:00
en_port.c mlx4: Ethernet port management modifications 2011-12-13 13:56:07 -05:00
en_port.h mlx4: Ethernet port management modifications 2011-12-13 13:56:07 -05:00
en_resources.c net/mlx4: move RSS related definitions to be global 2011-11-27 17:17:03 -05:00
en_rx.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-02-10 23:32:28 -05:00
en_selftest.c mlx4_core: Add "native" argument to mlx4_cmd and its callers (where needed) 2011-12-13 13:56:05 -05:00
en_tx.c drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages 2012-01-31 16:20:21 -05:00
eq.c mlx4: Fix kcalloc parameters swapped 2012-02-13 16:00:58 -05:00
fw.c mlx4_core: removed function index from vf. 2012-01-22 15:08:43 -05:00
fw.h mlx4_core: removed function index from vf. 2012-01-22 15:08:43 -05:00
icm.c mlx4_core: Add "native" argument to mlx4_cmd and its callers (where needed) 2011-12-13 13:56:05 -05:00
icm.h
…
intf.c mlx4_core: adjust catas operation for SRIOV mode 2011-12-13 13:56:08 -05:00
main.c mlx4: remove unused field high_prios 2012-02-14 14:11:58 -05:00
mcg.c mlx4: attach multicast with correct flag 2012-02-14 14:11:58 -05:00
mlx4.h mlx4: remove unused field high_prios 2012-02-14 14:11:58 -05:00
mlx4_en.h mlx4: allow device removal by fixing dma unmap size 2012-02-06 14:42:28 -05:00
mr.c mlx4_core: removed function index from vf. 2012-01-22 15:08:43 -05:00
pd.c mlx4_core: removed function index from vf. 2012-01-22 15:08:43 -05:00
port.c mlx4: remove redundant adding of steering type to gid 2012-02-14 14:11:58 -05:00
profile.c mlx4_core: Fix mtt profile issue 2012-01-22 15:08:44 -05:00
qp.c mlx4_core: removed function index from vf. 2012-01-22 15:08:43 -05:00
reset.c
…
resource_tracker.c mlx4: add unicast steering entries to resource_tracker 2012-02-15 14:50:16 -05:00
sense.c mlx4_core: Add "native" argument to mlx4_cmd and its callers (where needed) 2011-12-13 13:56:05 -05:00
srq.c mlx4_core: removed function index from vf. 2012-01-22 15:08:43 -05:00