diff options
Diffstat (limited to 'drivers/infiniband/hw/nes/nes_nic.c')
| -rw-r--r-- | drivers/infiniband/hw/nes/nes_nic.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c index 49eb5111d2cd..70acda91eb2a 100644 --- a/drivers/infiniband/hw/nes/nes_nic.c +++ b/drivers/infiniband/hw/nes/nes_nic.c | |||
| @@ -373,11 +373,11 @@ static int nes_nic_send(struct sk_buff *skb, struct net_device *netdev) | |||
| 373 | wqe_fragment_length = (__le16 *)&nic_sqe->wqe_words[NES_NIC_SQ_WQE_LENGTH_0_TAG_IDX]; | 373 | wqe_fragment_length = (__le16 *)&nic_sqe->wqe_words[NES_NIC_SQ_WQE_LENGTH_0_TAG_IDX]; |
| 374 | 374 | ||
| 375 | /* setup the VLAN tag if present */ | 375 | /* setup the VLAN tag if present */ |
| 376 | if (vlan_tx_tag_present(skb)) { | 376 | if (skb_vlan_tag_present(skb)) { |
| 377 | nes_debug(NES_DBG_NIC_TX, "%s: VLAN packet to send... VLAN = %08X\n", | 377 | nes_debug(NES_DBG_NIC_TX, "%s: VLAN packet to send... VLAN = %08X\n", |
| 378 | netdev->name, vlan_tx_tag_get(skb)); | 378 | netdev->name, skb_vlan_tag_get(skb)); |
| 379 | wqe_misc = NES_NIC_SQ_WQE_TAGVALUE_ENABLE; | 379 | wqe_misc = NES_NIC_SQ_WQE_TAGVALUE_ENABLE; |
| 380 | wqe_fragment_length[0] = (__force __le16) vlan_tx_tag_get(skb); | 380 | wqe_fragment_length[0] = (__force __le16) skb_vlan_tag_get(skb); |
| 381 | } else | 381 | } else |
| 382 | wqe_misc = 0; | 382 | wqe_misc = 0; |
| 383 | 383 | ||
| @@ -576,11 +576,12 @@ tso_sq_no_longer_full: | |||
| 576 | wqe_fragment_length = | 576 | wqe_fragment_length = |
| 577 | (__le16 *)&nic_sqe->wqe_words[NES_NIC_SQ_WQE_LENGTH_0_TAG_IDX]; | 577 | (__le16 *)&nic_sqe->wqe_words[NES_NIC_SQ_WQE_LENGTH_0_TAG_IDX]; |
| 578 | /* setup the VLAN tag if present */ | 578 | /* setup the VLAN tag if present */ |
| 579 | if (vlan_tx_tag_present(skb)) { | 579 | if (skb_vlan_tag_present(skb)) { |
| 580 | nes_debug(NES_DBG_NIC_TX, "%s: VLAN packet to send... VLAN = %08X\n", | 580 | nes_debug(NES_DBG_NIC_TX, "%s: VLAN packet to send... VLAN = %08X\n", |
| 581 | netdev->name, vlan_tx_tag_get(skb) ); | 581 | netdev->name, |
| 582 | skb_vlan_tag_get(skb)); | ||
| 582 | wqe_misc = NES_NIC_SQ_WQE_TAGVALUE_ENABLE; | 583 | wqe_misc = NES_NIC_SQ_WQE_TAGVALUE_ENABLE; |
| 583 | wqe_fragment_length[0] = (__force __le16) vlan_tx_tag_get(skb); | 584 | wqe_fragment_length[0] = (__force __le16) skb_vlan_tag_get(skb); |
| 584 | } else | 585 | } else |
| 585 | wqe_misc = 0; | 586 | wqe_misc = 0; |
| 586 | 587 | ||