Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df8a39de authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

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: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d8b9605d

Documentation/networking/filter.txt

+2 −2
Original line number Diff line number Diff line
@@ -279,8 +279,8 @@ Possible BPF extensions are shown in the following table: 
  hatype                                skb->dev->type

  rxhash                                skb->hash

  cpu                                   raw_smp_processor_id()

  vlan_tci                              vlan_tx_tag_get(skb)

  vlan_pr                               vlan_tx_tag_present(skb)

  vlan_tci                              skb_vlan_tag_get(skb)

  vlan_pr                               skb_vlan_tag_present(skb)

  rand                                  prandom_u32()



These extensions can also be prefixed with '#'.

drivers/infiniband/hw/nes/nes_nic.c

+7 −6
Original line number Diff line number Diff line
@@ -373,11 +373,11 @@ static int nes_nic_send(struct sk_buff *skb, struct net_device *netdev) 
	wqe_fragment_length = (__le16 *)&nic_sqe->wqe_words[NES_NIC_SQ_WQE_LENGTH_0_TAG_IDX];



	/* setup the VLAN tag if present */

	if (vlan_tx_tag_present(skb)) {

	if (skb_vlan_tag_present(skb)) {

		nes_debug(NES_DBG_NIC_TX, "%s: VLAN packet to send... VLAN = %08X\n",

				netdev->name, vlan_tx_tag_get(skb));

				netdev->name, skb_vlan_tag_get(skb));

		wqe_misc = NES_NIC_SQ_WQE_TAGVALUE_ENABLE;

		wqe_fragment_length[0] = (__force __le16) vlan_tx_tag_get(skb);

		wqe_fragment_length[0] = (__force __le16) skb_vlan_tag_get(skb);

	} else

		wqe_misc = 0;
@@ -576,11 +576,12 @@ static int nes_netdev_start_xmit(struct sk_buff *skb, struct net_device *netdev) 
				wqe_fragment_length =

						(__le16 *)&nic_sqe->wqe_words[NES_NIC_SQ_WQE_LENGTH_0_TAG_IDX];

				/* setup the VLAN tag if present */

				if (vlan_tx_tag_present(skb)) {

				if (skb_vlan_tag_present(skb)) {

					nes_debug(NES_DBG_NIC_TX, "%s: VLAN packet to send... VLAN = %08X\n",

							netdev->name, vlan_tx_tag_get(skb) );

							netdev->name,

						  skb_vlan_tag_get(skb));

					wqe_misc = NES_NIC_SQ_WQE_TAGVALUE_ENABLE;

					wqe_fragment_length[0] = (__force __le16) vlan_tx_tag_get(skb);

					wqe_fragment_length[0] = (__force __le16) skb_vlan_tag_get(skb);

				} else

					wqe_misc = 0;

drivers/net/ethernet/3com/typhoon.c

+2 −2
Original line number Diff line number Diff line
@@ -769,11 +769,11 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device *dev) 
		first_txd->processFlags |= TYPHOON_TX_PF_IP_CHKSUM;

	}



	if(vlan_tx_tag_present(skb)) {

	if (skb_vlan_tag_present(skb)) {

		first_txd->processFlags |=

		    TYPHOON_TX_PF_INSERT_VLAN | TYPHOON_TX_PF_VLAN_PRIORITY;

		first_txd->processFlags |=

		    cpu_to_le32(htons(vlan_tx_tag_get(skb)) <<

		    cpu_to_le32(htons(skb_vlan_tag_get(skb)) <<

				TYPHOON_TX_PF_VLAN_TAG_SHIFT);

	}

drivers/net/ethernet/alteon/acenic.c

+4 −4
Original line number Diff line number Diff line
@@ -2429,9 +2429,9 @@ static netdev_tx_t ace_start_xmit(struct sk_buff *skb, 
		flagsize = (skb->len << 16) | (BD_FLG_END);

		if (skb->ip_summed == CHECKSUM_PARTIAL)

			flagsize |= BD_FLG_TCP_UDP_SUM;

		if (vlan_tx_tag_present(skb)) {

		if (skb_vlan_tag_present(skb)) {

			flagsize |= BD_FLG_VLAN_TAG;

			vlan_tag = vlan_tx_tag_get(skb);

			vlan_tag = skb_vlan_tag_get(skb);

		}

		desc = ap->tx_ring + idx;

		idx = (idx + 1) % ACE_TX_RING_ENTRIES(ap);
@@ -2450,9 +2450,9 @@ static netdev_tx_t ace_start_xmit(struct sk_buff *skb, 
		flagsize = (skb_headlen(skb) << 16);

		if (skb->ip_summed == CHECKSUM_PARTIAL)

			flagsize |= BD_FLG_TCP_UDP_SUM;

		if (vlan_tx_tag_present(skb)) {

		if (skb_vlan_tag_present(skb)) {

			flagsize |= BD_FLG_VLAN_TAG;

			vlan_tag = vlan_tx_tag_get(skb);

			vlan_tag = skb_vlan_tag_get(skb);

		}



		ace_load_tx_bd(ap, ap->tx_ring + idx, mapping, flagsize, vlan_tag);

drivers/net/ethernet/amd/amd8111e.c

+2 −2
Original line number Diff line number Diff line
@@ -1299,11 +1299,11 @@ static netdev_tx_t amd8111e_start_xmit(struct sk_buff *skb, 
	lp->tx_ring[tx_index].tx_flags = 0;



#if AMD8111E_VLAN_TAG_USED

	if (vlan_tx_tag_present(skb)) {

	if (skb_vlan_tag_present(skb)) {

		lp->tx_ring[tx_index].tag_ctrl_cmd |=

				cpu_to_le16(TCC_VLAN_INSERT);

		lp->tx_ring[tx_index].tag_ctrl_info =

				cpu_to_le16(vlan_tx_tag_get(skb));

				cpu_to_le16(skb_vlan_tag_get(skb));



	}

#endif