diff options
Diffstat (limited to 'drivers/net/benet/be_main.c')
-rw-r--r-- | drivers/net/benet/be_main.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index 7b19931acba..3fb4a1f465e 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c | |||
@@ -1017,7 +1017,8 @@ static void be_rx_compl_process(struct be_adapter *adapter, | |||
1017 | kfree_skb(skb); | 1017 | kfree_skb(skb); |
1018 | return; | 1018 | return; |
1019 | } | 1019 | } |
1020 | vlan_hwaccel_receive_skb(skb, adapter->vlan_grp, rxcp->vid); | 1020 | vlan_hwaccel_receive_skb(skb, adapter->vlan_grp, |
1021 | rxcp->vlan_tag); | ||
1021 | } else { | 1022 | } else { |
1022 | netif_receive_skb(skb); | 1023 | netif_receive_skb(skb); |
1023 | } | 1024 | } |
@@ -1077,7 +1078,8 @@ static void be_rx_compl_process_gro(struct be_adapter *adapter, | |||
1077 | if (likely(!rxcp->vlanf)) | 1078 | if (likely(!rxcp->vlanf)) |
1078 | napi_gro_frags(&eq_obj->napi); | 1079 | napi_gro_frags(&eq_obj->napi); |
1079 | else | 1080 | else |
1080 | vlan_gro_frags(&eq_obj->napi, adapter->vlan_grp, rxcp->vid); | 1081 | vlan_gro_frags(&eq_obj->napi, adapter->vlan_grp, |
1082 | rxcp->vlan_tag); | ||
1081 | } | 1083 | } |
1082 | 1084 | ||
1083 | static void be_parse_rx_compl_v1(struct be_adapter *adapter, | 1085 | static void be_parse_rx_compl_v1(struct be_adapter *adapter, |
@@ -1106,9 +1108,9 @@ static void be_parse_rx_compl_v1(struct be_adapter *adapter, | |||
1106 | AMAP_GET_BITS(struct amap_eth_rx_compl_v1, rsshash, rxcp); | 1108 | AMAP_GET_BITS(struct amap_eth_rx_compl_v1, rsshash, rxcp); |
1107 | if (rxcp->vlanf) { | 1109 | if (rxcp->vlanf) { |
1108 | rxcp->vtm = AMAP_GET_BITS(struct amap_eth_rx_compl_v1, vtm, | 1110 | rxcp->vtm = AMAP_GET_BITS(struct amap_eth_rx_compl_v1, vtm, |
1109 | compl); | 1111 | compl); |
1110 | rxcp->vid = AMAP_GET_BITS(struct amap_eth_rx_compl_v1, vlan_tag, | 1112 | rxcp->vlan_tag = AMAP_GET_BITS(struct amap_eth_rx_compl_v1, vlan_tag, |
1111 | compl); | 1113 | compl); |
1112 | } | 1114 | } |
1113 | } | 1115 | } |
1114 | 1116 | ||
@@ -1138,9 +1140,9 @@ static void be_parse_rx_compl_v0(struct be_adapter *adapter, | |||
1138 | AMAP_GET_BITS(struct amap_eth_rx_compl_v0, rsshash, rxcp); | 1140 | AMAP_GET_BITS(struct amap_eth_rx_compl_v0, rsshash, rxcp); |
1139 | if (rxcp->vlanf) { | 1141 | if (rxcp->vlanf) { |
1140 | rxcp->vtm = AMAP_GET_BITS(struct amap_eth_rx_compl_v0, vtm, | 1142 | rxcp->vtm = AMAP_GET_BITS(struct amap_eth_rx_compl_v0, vtm, |
1141 | compl); | 1143 | compl); |
1142 | rxcp->vid = AMAP_GET_BITS(struct amap_eth_rx_compl_v0, vlan_tag, | 1144 | rxcp->vlan_tag = AMAP_GET_BITS(struct amap_eth_rx_compl_v0, vlan_tag, |
1143 | compl); | 1145 | compl); |
1144 | } | 1146 | } |
1145 | } | 1147 | } |
1146 | 1148 | ||
@@ -1170,10 +1172,11 @@ static struct be_rx_compl_info *be_rx_compl_get(struct be_rx_obj *rxo) | |||
1170 | rxcp->vlanf = 0; | 1172 | rxcp->vlanf = 0; |
1171 | 1173 | ||
1172 | if (!lancer_chip(adapter)) | 1174 | if (!lancer_chip(adapter)) |
1173 | rxcp->vid = swab16(rxcp->vid); | 1175 | rxcp->vlan_tag = swab16(rxcp->vlan_tag); |
1174 | 1176 | ||
1175 | if ((adapter->pvid == rxcp->vid) && | 1177 | if (((adapter->pvid & VLAN_VID_MASK) == |
1176 | !adapter->vlan_tag[rxcp->vid]) | 1178 | (rxcp->vlan_tag & VLAN_VID_MASK)) && |
1179 | !adapter->vlan_tag[rxcp->vlan_tag]) | ||
1177 | rxcp->vlanf = 0; | 1180 | rxcp->vlanf = 0; |
1178 | } | 1181 | } |
1179 | 1182 | ||