openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

i40iw: Add missing VLAN priority 

Set the VLAN priority which is in the upper 3 bits of the VLAN
tag field in the QP context.

Signed-off-by: Mustafa Ismail <mustafa.ismail@intel.com>
Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Mustafa Ismail 2017-09-19 09:19:12 -05:00 committed by Doug Ledford
parent 471b370d52
commit dfc612b340
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/infiniband/hw/i40iw/i40iw_cm.c
View File

@ -3255,7 +3255,8 @@ static void i40iw_init_tcp_ctx(struct i40iw_cm_node *cm_node,
tcp_info->snd_mss = cpu_to_le32(((u32)cm_node->tcp_cntxt.mss)); tcp_info->snd_mss = cpu_to_le32(((u32)cm_node->tcp_cntxt.mss));
if (cm_node->vlan_id < VLAN_TAG_PRESENT) { if (cm_node->vlan_id < VLAN_TAG_PRESENT) {
tcp_info->insert_vlan_tag = true; tcp_info->insert_vlan_tag = true;
tcp_info->vlan_tag = cpu_to_le16(cm_node->vlan_id); tcp_info->vlan_tag = cpu_to_le16(((u16)cm_node->user_pri << I40IW_VLAN_PRIO_SHIFT) |
cm_node->vlan_id);
} }
if (cm_node->ipv4) { if (cm_node->ipv4) {
tcp_info->src_port = cpu_to_le16(cm_node->loc_port); tcp_info->src_port = cpu_to_le16(cm_node->loc_port);

2
drivers/infiniband/hw/i40iw/i40iw_cm.h
View File

@ -71,6 +71,8 @@
#define I40IW_HW_IRD_SETTING_32 32 #define I40IW_HW_IRD_SETTING_32 32
#define I40IW_HW_IRD_SETTING_64 64 #define I40IW_HW_IRD_SETTING_64 64
#define I40IW_VLAN_PRIO_SHIFT 13
enum ietf_mpa_flags { enum ietf_mpa_flags {
IETF_MPA_FLAGS_MARKERS = 0x80, /* receive Markers */ IETF_MPA_FLAGS_MARKERS = 0x80, /* receive Markers */
IETF_MPA_FLAGS_CRC = 0x40, /* receive Markers */ IETF_MPA_FLAGS_CRC = 0x40, /* receive Markers */