OpenCloudOS-Kernel/drivers/net/ethernet/mellanox/mlx4
David S. Miller 6bc19fb82d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge 'net' bug fixes into 'net-next' as we have patches
that will build on top of them.

This merge commit includes a change from Emil Goode
(emilgoode@gmail.com) that fixes a warning that would
have been introduced by this merge.  Specifically it
fixes the pingv6_ops method ipv6_chk_addr() to add a
"const" to the "struct net_device *dev" argument and
likewise update the dummy_ipv6_chk_addr() declaration.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-06-05 16:37:30 -07:00
..
Kconfig mlx4_en: Remove remnants of LRO support 2012-11-19 19:13:59 -05:00
Makefile net/mlx4_en: Add HW timestamping (TS) support 2013-04-24 16:30:14 -04:00
alloc.c mlx4_core: Change bitmap allocator to work in round-robin fashion 2012-05-14 13:44:38 -07:00
catas.c mlx4: Add support for EEH error recovery 2012-07-25 15:24:13 -07:00
cmd.c net/mlx4_core: Return -EPROBE_DEFER when a VF is probed before PF is sufficiently initialized 2013-06-04 12:58:24 -07:00
cq.c net/mlx4_en: Add HW timestamping (TS) support 2013-04-24 16:30:14 -04:00
en_clock.c mlx4_en: fix a build error on 32bit arches 2013-04-30 19:00:25 -04:00
en_cq.c net/mlx4_en: Add HW timestamping (TS) support 2013-04-24 16:30:14 -04:00
en_dcb_nl.c net/mlx4_en: Advertize DCB_CAP_DCBX_HOST in getdcbx 2013-04-07 16:55:47 -04:00
en_ethtool.c InfiniBand/RDMA changes for the 3.10 merge window: 2013-05-08 15:29:48 -07:00
en_main.c net/mlx4_en: Add HW timestamping (TS) support 2013-04-24 16:30:14 -04:00
en_netdev.c net/mlx4_en: Handle unassigned VF MAC address correctly 2013-06-04 12:58:24 -07:00
en_port.c mlx4: Ethernet port management modifications 2011-12-13 13:56:07 -05:00
en_port.h net/mlx4_core: set port QoS attributes 2012-04-05 05:08:03 -04:00
en_resources.c net/mlx4: Strengthen VLAN tags/priorities enforcement in VST mode 2013-05-11 16:12:44 -07:00
en_rx.c net/mlx4_en: Add HW timestamping (TS) support 2013-04-24 16:30:14 -04:00
en_selftest.c drivers:net: Remove unnecessary OOM messages after netdev_alloc_skb 2013-03-09 16:09:19 -05:00
en_tx.c mlx4: use __netdev_pick_tx instead of __skb_tx_hash in mlx4_en_select_queue 2013-06-04 17:29:51 -07:00
eq.c mlx4_core: Reduce warning message for SRQ_LIMIT event to debug level 2013-04-24 17:51:27 -07:00
fw.c net/mlx4_core: Keep VF assigned MAC in the PF admin table 2013-06-04 12:58:24 -07:00
fw.h net/mlx4_core: Read HCA frequency and map internal clock 2013-04-24 16:30:13 -04:00
icm.c mlx4_core: Fix integer overflows so 8TBs of memory registration works 2012-09-13 17:52:02 -07:00
icm.h mlx4_core: Fix integer overflows so 8TBs of memory registration works 2012-09-13 17:52:02 -07:00
intf.c mlx4: Use port management change event instead of smp_snoop 2012-07-10 09:47:10 -07:00
main.c net/mlx4_core: Return -EPROBE_DEFER when a VF is probed before PF is sufficiently initialized 2013-06-04 12:58:24 -07:00
mcg.c InfiniBand/RDMA changes for the 3.10 merge window: 2013-05-08 15:29:48 -07:00
mlx4.h InfiniBand/RDMA changes for the 3.10 merge window: 2013-05-08 15:29:48 -07:00
mlx4_en.h net/mlx4: use one page fragment per incoming frame 2013-06-04 17:28:18 -07:00
mr.c net/mlx4_core: Fix endianness bug in set_param_l 2013-03-07 15:52:03 -05:00
pd.c net/mlx4_core: Fix endianness bug in set_param_l 2013-03-07 15:52:03 -05:00
port.c net/mlx4: Add set VF default vlan ID and priority support 2013-04-26 23:29:13 -04:00
profile.c mlx4_core: Fix integer overflow issues around MTT table 2012-08-15 21:05:26 -07:00
qp.c net/mlx4_core: Fix endianness bug in set_param_l 2013-03-07 15:52:03 -05:00
reset.c mlx4: Use PCI Express Capability accessors 2012-08-23 10:11:13 -06:00
resource_tracker.c net/mlx4: Strengthen VLAN tags/priorities enforcement in VST mode 2013-05-11 16:12:44 -07:00
sense.c Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 2012-10-02 09:54:49 -07:00
srq.c mlx4_core: Implement SRQ object lookup from srqn 2013-04-16 22:42:55 -07:00