Toshiaki Makita 9ed7806263 veth: Fix vlan_features so as to be able to use stacked vlan interfaces ...

[ Upstream commit 8d0d21f4053c07714802cbe8b1fe26913ec296cc ]

Even if we create a stacked vlan interface such as veth0.10.20, it sends
single tagged frames (tagged with only vid 10).
Because vlan_features of a veth interface has the
NETIF_F_HW_VLAN_[CTAG/STAG]_TX bits, veth0.10 also has that feature, so
dev_hard_start_xmit(veth0.10) doesn't call __vlan_put_tag() and
vlan_dev_hard_start_xmit(veth0.10) overwrites vlan_tci.
This prevents us from using a combination of 802.1ad and 802.1Q
in containers, etc.

Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Acked-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2014-03-23 21:43:59 -07:00

..

appletalk

…

arcnet

…

bonding

bonding: 802.3ad: make aggregator_identifier bond-private

2014-03-06 22:06:13 -08:00

caif

virtio: use size-based config accessors.

2013-10-17 10:55:37 +10:30

can

can: kvaser_usb: check number of channels returned by HW

2014-03-06 22:06:23 -08:00

cris

…

dsa

…

ethernet

net: mvneta: replace Tx timer with a real interrupt

2014-03-06 22:06:15 -08:00

fddi

net:drivers/net: Miscellaneous conversions to ETH_ALEN

2013-10-02 17:04:45 -04:00

hamradio

hamradio/yam: fix info leak in ioctl

2013-12-19 15:09:38 -05:00

hippi

…

hyperv

hyperv: Fix the carrier status setting

2014-03-06 22:06:13 -08:00

ieee802154

tree-wide: use reinit_completion instead of INIT_COMPLETION

2013-11-15 09:32:21 +09:00

irda

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2013-11-15 16:47:22 -08:00

phy

phy: IRQ cannot be shared

2013-12-29 22:35:16 -05:00

plip

net:drivers/net: Miscellaneous conversions to ETH_ALEN

2013-10-02 17:04:45 -04:00

ppp

net: rework recvmsg handler msg_name and msg_namelen logic

2013-11-20 21:52:30 -05:00

slip

slip/slcan: added locking in wakeup function

2013-09-20 15:38:26 -04:00

team

net: core: explicitly select a txq before doing l2 forwarding

2014-01-10 13:23:08 -05:00

usb

usbnet: remove generic hard_header_len check

2014-03-06 22:06:13 -08:00

vmxnet3

vmxnet3: Remove extern from function prototypes

2013-09-24 16:37:10 -07:00

wan

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-11-04 13:48:30 -05:00

wimax

wimax: Remove extern from function prototypes

2013-09-24 16:46:22 -07:00

wireless

rtlwifi: rtl8192ce: Fix too long disable of IRQs

2014-03-06 22:06:10 -08:00

xen-netback

xen-netback: Include header for vmalloc

2014-01-05 20:34:36 -05:00

dummy.c

net: Explicitly initialize u64_stats_sync structures for lockdep

2013-11-06 12:40:25 +01:00

eql.c

…

ifb.c

net: Explicitly initialize u64_stats_sync structures for lockdep

2013-11-06 12:40:25 +01:00

Kconfig

…

LICENSE.SRC

…

loopback.c

net: Explicitly initialize u64_stats_sync structures for lockdep

2013-11-06 12:40:25 +01:00

macvlan.c

net: core: explicitly select a txq before doing l2 forwarding

2014-01-10 13:23:08 -05:00

macvtap.c

macvtap: signal truncated packets

2013-12-11 15:23:06 -05:00

Makefile

…

mdio.c

…

mii.c

…

netconsole.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-11-04 13:48:30 -05:00

nlmon.c

net: Explicitly initialize u64_stats_sync structures for lockdep

2013-11-06 12:40:25 +01:00

ntb_netdev.c

…

rionet.c

…

sb1000.c

…

Space.c

net/ethernet: Drop H8/300 Ethernet driver

2013-09-16 18:20:24 -07:00

sungem_phy.c

…

tun.c

net: core: explicitly select a txq before doing l2 forwarding

2014-01-10 13:23:08 -05:00

veth.c

veth: Fix vlan_features so as to be able to use stacked vlan interfaces

2014-03-23 21:43:59 -07:00

virtio_net.c

virtio-net: fix refill races during restore

2014-01-02 19:23:03 -05:00

vxlan.c

net/vxlan: Share RX skb de-marking and checksum checks with ovs

2014-02-06 11:34:07 -08:00

xen-netfront.c

xen/pvhvm: If xen_platform_pci=0 is set don't blow up (v4).

2014-02-13 13:55:28 -08:00