diff options
author | David S. Miller | 2017-05-27 02:46:35 +0200 |
---|---|---|
committer | David S. Miller | 2017-05-27 02:46:35 +0200 |
commit | 34aa83c2fc23e055968387c8b78ac8bafd735aff (patch) | |
tree | a53a341d74613e512bf467ea12615f509cb53536 /include/linux/mlx5/device.h | |
parent | Merge branch 'ibmvnic-Driver-updates' (diff) | |
parent | Merge tag 'led_fixes_for_4-12-rc3' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
download | kernel-qcow2-linux-34aa83c2fc23e055968387c8b78ac8bafd735aff.tar.gz kernel-qcow2-linux-34aa83c2fc23e055968387c8b78ac8bafd735aff.tar.xz kernel-qcow2-linux-34aa83c2fc23e055968387c8b78ac8bafd735aff.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Overlapping changes in drivers/net/phy/marvell.c, bug fix in 'net'
restricting a HW workaround alongside cleanups in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/mlx5/device.h')
-rw-r--r-- | include/linux/mlx5/device.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h index 786a43843da9..b26a478930eb 100644 --- a/include/linux/mlx5/device.h +++ b/include/linux/mlx5/device.h @@ -789,8 +789,14 @@ enum { }; enum { - CQE_RSS_HTYPE_IP = 0x3 << 6, - CQE_RSS_HTYPE_L4 = 0x3 << 2, + CQE_RSS_HTYPE_IP = 0x3 << 2, + /* cqe->rss_hash_type[3:2] - IP destination selected for hash + * (00 = none, 01 = IPv4, 10 = IPv6, 11 = Reserved) + */ + CQE_RSS_HTYPE_L4 = 0x3 << 6, + /* cqe->rss_hash_type[7:6] - L4 destination selected for hash + * (00 = none, 01 = TCP. 10 = UDP, 11 = IPSEC.SPI + */ }; enum { |