net: vlan: add protocol argument to packet tagging functions

Browse source

Add a protocol argument to the VLAN packet tagging functions. In case of HW
tagging, we need that protocol available in the ndo_start_xmit functions,
so it is stored in a new field in the skb. The new field fits into a hole
(on 64 bit) and doesn't increase the sks's size.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

Patrick McHardy 2013-04-19 02:04:30 +00:00 • committed by David S. Miller

parent 1fd9b1fc31

commit 86a9bad3ab

56 changed files with 107 additions and 84 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/infiniband/hw/nes/nes_hw.c

View file

4

drivers/net/bonding/bond_alb.c

View file

2

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

View file

2

drivers/net/ethernet/adaptec/starfire.c

View file

2

drivers/net/ethernet/alteon/acenic.c

View file

2

drivers/net/ethernet/amd/amd8111e.c

View file

2

drivers/net/ethernet/atheros/atl1c/atl1c_main.c

View file

2

drivers/net/ethernet/atheros/atl1e/atl1e_main.c

View file

2

drivers/net/ethernet/atheros/atlx/atl1.c

View file

2

drivers/net/ethernet/atheros/atlx/atl2.c

View file

2

drivers/net/ethernet/broadcom/bnx2.c

View file

4

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

View file

2

drivers/net/ethernet/broadcom/tg3.c

View file

2

drivers/net/ethernet/brocade/bna/bnad.c

View file

2

drivers/net/ethernet/chelsio/cxgb/sge.c

View file

4

drivers/net/ethernet/chelsio/cxgb3/sge.c

View file

4

drivers/net/ethernet/chelsio/cxgb4/sge.c

View file

5

drivers/net/ethernet/chelsio/cxgb4vf/sge.c

View file

2

drivers/net/ethernet/cisco/enic/enic_main.c

View file

6

drivers/net/ethernet/emulex/benet/be_main.c

View file

2

drivers/net/ethernet/intel/e1000/e1000_main.c

View file

2

drivers/net/ethernet/intel/e1000e/netdev.c

View file

2

drivers/net/ethernet/intel/igb/igb_main.c

View file

2

drivers/net/ethernet/intel/igbvf/netdev.c

View file

4

drivers/net/ethernet/intel/ixgb/ixgb_main.c

View file

2

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

View file

2

drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

View file

2

drivers/net/ethernet/jme.c

View file

2

drivers/net/ethernet/marvell/sky2.c

View file

4

drivers/net/ethernet/mellanox/mlx4/en_rx.c

View file

2

drivers/net/ethernet/myricom/myri10ge/myri10ge.c

View file

2

drivers/net/ethernet/natsemi/ns83820.c

View file

2

drivers/net/ethernet/neterion/s2io.c

View file

2

drivers/net/ethernet/neterion/vxge/vxge-main.c

View file

2

drivers/net/ethernet/nvidia/forcedeth.c

View file

8

drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c

View file

8

drivers/net/ethernet/qlogic/qlge/qlge_main.c

View file

2

drivers/net/ethernet/realtek/8139cp.c

View file

2

drivers/net/ethernet/realtek/r8169.c

View file

2

drivers/net/ethernet/tehuti/tehuti.c

View file

2

drivers/net/ethernet/via/via-rhine.c

View file

2

drivers/net/ethernet/via/via-velocity.c

View file

2

drivers/net/usb/cdc_mbim.c

View file

2

drivers/net/vmxnet3/vmxnet3_drv.c

View file

33

include/linux/if_vlan.h

View file

2

include/linux/skbuff.h

View file

8

net/8021q/vlan_core.c

View file

2

net/8021q/vlan_dev.c

View file

2

net/batman-adv/bridge_loop_avoidance.c

View file

2

net/bridge/br_netfilter.c

View file

4

net/bridge/br_vlan.c

View file

5

net/core/dev.c

View file

5

net/core/netpoll.c

View file

1

net/core/skbuff.c

View file

6

net/openvswitch/actions.c

View file

2

net/openvswitch/datapath.c

View file