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>

diff --cc Documentation/networking/filter.txt
Simple merge

diff --cc drivers/infiniband/hw/nes/nes_nic.c
Simple merge

diff --cc drivers/net/ethernet/3com/typhoon.c
Simple merge

diff --cc drivers/net/ethernet/alteon/acenic.c
Simple merge

diff --cc drivers/net/ethernet/amd/amd8111e.c
Simple merge

diff --cc drivers/net/ethernet/amd/xgbe/xgbe-drv.c
Simple merge

diff --cc drivers/net/ethernet/atheros/atl1c/atl1c_main.c
Simple merge

diff --cc drivers/net/ethernet/atheros/atl1e/atl1e_main.c
Simple merge

diff --cc drivers/net/ethernet/atheros/atlx/atl1.c
Simple merge

diff --cc drivers/net/ethernet/atheros/atlx/atl2.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/tg3.c
Simple merge

diff --cc drivers/net/ethernet/brocade/bna/bnad.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb/sge.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb3/sge.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/sge.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4vf/sge.c
Simple merge

diff --cc drivers/net/ethernet/cisco/enic/enic_main.c
Simple merge

diff --cc drivers/net/ethernet/emulex/benet/be_main.c
Simple merge

diff --cc drivers/net/ethernet/freescale/gianfar.c
Simple merge

diff --cc drivers/net/ethernet/ibm/ehea/ehea_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/e1000/e1000_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/e1000e/netdev.c
Simple merge

diff --cc drivers/net/ethernet/intel/fm10k/fm10k_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_txrx.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40evf/i40e_txrx.c
Simple merge

diff --cc drivers/net/ethernet/intel/igb/igb_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/igbvf/netdev.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgb/ixgb_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
Simple merge

diff --cc drivers/net/ethernet/jme.c
Simple merge

diff --cc drivers/net/ethernet/marvell/sky2.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/en_tx.c
Simple merge

diff --cc drivers/net/ethernet/natsemi/ns83820.c
Simple merge

diff --cc drivers/net/ethernet/neterion/s2io.c
Simple merge

diff --cc drivers/net/ethernet/neterion/vxge/vxge-main.c
Simple merge

diff --cc drivers/net/ethernet/nvidia/forcedeth.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qlge/qlge_main.c
Simple merge

diff --cc drivers/net/ethernet/realtek/8139cp.c
Simple merge

diff --cc drivers/net/ethernet/realtek/r8169.c
Simple merge

diff --cc drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c
Simple merge

diff --cc drivers/net/ethernet/tehuti/tehuti.c
Simple merge

diff --cc drivers/net/ethernet/via/via-rhine.c
Simple merge

diff --cc drivers/net/ethernet/via/via-velocity.c
Simple merge

diff --cc drivers/net/macvtap.c
Simple merge

diff --cc drivers/net/tun.c
Simple merge

diff --cc drivers/net/usb/r8152.c
Simple merge

diff --cc drivers/net/vmxnet3/vmxnet3_drv.c
Simple merge

diff --cc drivers/net/vxlan.c
Simple merge

diff --cc drivers/s390/net/qeth_l3_main.c
Simple merge

diff --cc drivers/vhost/net.c
Simple merge

diff --cc include/linux/if_vlan.h
Simple merge

diff --cc include/net/pkt_sched.h
Simple merge

diff --cc include/trace/events/net.h
Simple merge

diff --cc net/8021q/vlan_core.c
Simple merge

diff --cc net/bridge/br_netfilter.c
Simple merge

diff --cc net/bridge/br_private.h
Simple merge

diff --cc net/bridge/br_vlan.c
Simple merge

diff --cc net/bridge/netfilter/ebt_vlan.c
Simple merge

diff --cc net/bridge/netfilter/ebtables.c
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/netpoll.c
Simple merge

diff --cc net/core/skbuff.c
Simple merge

diff --cc net/ipv4/geneve.c
Simple merge

diff --cc net/openvswitch/actions.c
Simple merge

diff --cc net/openvswitch/datapath.c
Simple merge

diff --cc net/openvswitch/flow.c
Simple merge

diff --cc net/openvswitch/vport-gre.c
Simple merge

diff --cc net/openvswitch/vport.c
Simple merge

diff --cc net/packet/af_packet.c
Simple merge

diff --cc net/sched/em_meta.c
Simple merge

diff --cc net/wireless/util.c
Simple merge