aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2015-01-13 11:13:44 -0500
committerDavid S. Miller <davem@davemloft.net>2015-01-13 17:51:08 -0500
commitdf8a39defad46b83694ea6dd868d332976d62cc0 (patch)
treefe19bca0c2788033d49686babfc7b3853fa13340 /drivers/s390
parentd8b9605d2697c48fb822c821c5751afbb4567003 (diff)
net: rename vlan_tx_* helpers since "tx" is misleading there
The same macros are used for rx as well. So rename it. Signed-off-by: Jiri Pirko <jiri@resnulli.us> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/net/qeth_l3_main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 625227ad16ee..dd4ab8d73d34 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -2800,12 +2800,12 @@ static void qeth_l3_fill_header(struct qeth_card *card, struct qeth_hdr *hdr,
2800 * before we're going to overwrite this location with next hop ip. 2800 * before we're going to overwrite this location with next hop ip.
2801 * v6 uses passthrough, v4 sets the tag in the QDIO header. 2801 * v6 uses passthrough, v4 sets the tag in the QDIO header.
2802 */ 2802 */
2803 if (vlan_tx_tag_present(skb)) { 2803 if (skb_vlan_tag_present(skb)) {
2804 if ((ipv == 4) || (card->info.type == QETH_CARD_TYPE_IQD)) 2804 if ((ipv == 4) || (card->info.type == QETH_CARD_TYPE_IQD))
2805 hdr->hdr.l3.ext_flags = QETH_HDR_EXT_VLAN_FRAME; 2805 hdr->hdr.l3.ext_flags = QETH_HDR_EXT_VLAN_FRAME;
2806 else 2806 else
2807 hdr->hdr.l3.ext_flags = QETH_HDR_EXT_INCLUDE_VLAN_TAG; 2807 hdr->hdr.l3.ext_flags = QETH_HDR_EXT_INCLUDE_VLAN_TAG;
2808 hdr->hdr.l3.vlan_id = vlan_tx_tag_get(skb); 2808 hdr->hdr.l3.vlan_id = skb_vlan_tag_get(skb);
2809 } 2809 }
2810 2810
2811 hdr->hdr.l3.length = skb->len - sizeof(struct qeth_hdr); 2811 hdr->hdr.l3.length = skb->len - sizeof(struct qeth_hdr);
@@ -2986,7 +2986,7 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
2986 skb_pull(new_skb, ETH_HLEN); 2986 skb_pull(new_skb, ETH_HLEN);
2987 } 2987 }
2988 2988
2989 if (ipv != 4 && vlan_tx_tag_present(new_skb)) { 2989 if (ipv != 4 && skb_vlan_tag_present(new_skb)) {
2990 skb_push(new_skb, VLAN_HLEN); 2990 skb_push(new_skb, VLAN_HLEN);
2991 skb_copy_to_linear_data(new_skb, new_skb->data + 4, 4); 2991 skb_copy_to_linear_data(new_skb, new_skb->data + 4, 4);
2992 skb_copy_to_linear_data_offset(new_skb, 4, 2992 skb_copy_to_linear_data_offset(new_skb, 4,
@@ -2995,7 +2995,7 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
2995 new_skb->data + 12, 4); 2995 new_skb->data + 12, 4);
2996 tag = (u16 *)(new_skb->data + 12); 2996 tag = (u16 *)(new_skb->data + 12);
2997 *tag = __constant_htons(ETH_P_8021Q); 2997 *tag = __constant_htons(ETH_P_8021Q);
2998 *(tag + 1) = htons(vlan_tx_tag_get(new_skb)); 2998 *(tag + 1) = htons(skb_vlan_tag_get(new_skb));
2999 } 2999 }
3000 } 3000 }
3001 3001