Vladimir Oltean b9cd75e668 net: mscc: ocelot: refuse to overwrite the port's native vlan ... The switch driver keeps a "vid" variable per port, which signifies _the_ VLAN ID that is stripped on that port's egress (aka the native VLAN on a trunk port). That is the way the hardware is designed (mostly). The port->vid is programmed into REW:PORT:PORT_VLAN_CFG:PORT_VID and the rewriter is told to send all traffic as tagged except the one having port->vid. There exists a possibility of finer-grained egress untagging decisions: using the VCAP IS1 engine, one rule can be added to match every VLAN-tagged frame whose VLAN should be untagged, and set POP_CNT=1 as action. However, the IS1 can hold at most 512 entries, and the VLANs are in the order of 6 * 4096. So the code is fine for now. But this sequence of commands: $ bridge vlan add dev swp0 vid 1 pvid untagged $ bridge vlan add dev swp0 vid 2 untagged makes untagged and pvid-tagged traffic be sent out of swp0 as tagged with VID 1, despite user's request. Prevent that from happening. The user should temporarily remove the existing untagged VLAN (1 in this case), add it back as tagged, and then add the new untagged VLAN (2 in this case). Cc: Antoine Tenart <antoine.tenart@bootlin.com> Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> Fixes: 7142529f16 ("net: mscc: ocelot: add VLAN filtering") Signed-off-by: Vladimir Oltean <olteanv@gmail.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: David S. Miller <davem@davemloft.net>		2019-10-29 16:22:07 -07:00
..
accessibility
acpi	ACPI fixes for 5.4-rc4	2019-10-18 08:38:26 -07:00
amba	ARM updates for 5.4-rc1:	2019-09-22 09:39:09 -07:00
android	binder: Fix comment headers on binder_alloc_prepare_to_free()	2019-10-10 14:39:23 +02:00
ata	libata/ahci: Fix PCS quirk application	2019-10-15 14:10:19 -06:00
atm	atm: he: clean up an indentation issue	2019-09-25 13:54:45 +02:00
auxdisplay
base	drivers/base/memory.c: don't access uninitialized memmaps in soft_offline_page_store()	2019-10-19 06:32:31 -04:00
bcma
block	zram: fix race between backing_dev_show and backing_dev_store	2019-10-19 06:32:32 -04:00
bluetooth
bus	ARM: SoC fixes	2019-09-30 10:04:28 -07:00
cdrom
char	char/random: Add a newline at the end of the file	2019-10-02 13:49:43 -07:00
clk	Fixes for omaps for v5.4-rc cycle	2019-10-03 09:15:19 -07:00
clocksource	timer-of: don't use conditional expression with mixed 'void' types	2019-10-02 16:16:07 -07:00
connector
counter
cpufreq	cpufreq: Avoid cpufreq_suspend() deadlock on system shutdown	2019-10-10 11:11:17 +02:00
cpuidle
crypto	net: use skb_queue_empty_lockless() in busy poll contexts	2019-10-28 13:33:41 -07:00
dax
dca
devfreq
dio
dma	Main MIPS changes for v5.4:	2019-09-22 09:30:30 -07:00
dma-buf	dma-buf/resv: fix exclusive fence get	2019-10-10 17:05:20 +02:00
edac	ARM updates for 5.4-rc1:	2019-09-22 09:39:09 -07:00
eisa
extcon	chrome platform changes for v5.4	2019-09-19 14:14:28 -07:00
firewire
firmware	Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2019-10-15 09:20:07 -07:00
fpga
fsi
gnss
gpio	gpio: lynxpoint: set default handler to be handle_bad_irq()	2019-10-15 01:19:05 +02:00
gpu	-dma-resv: Change shared_count to post-increment to fix lima crash (Qiang)	2019-10-18 06:40:28 +10:00
greybus
hid	HID: hyperv: Use in-place iterator API in the channel callback	2019-10-01 14:49:41 -04:00
hsi	HSI changes for the 5.4 series	2019-09-22 12:02:21 -07:00
hv	Drivers: hv: vmbus: Fix harmless building warnings without CONFIG_PM_SLEEP	2019-10-01 14:49:45 -04:00
hwmon	hwmon: (nct7904) Add array fan_alarm and vsen_alarm to store the alarms in nct7904_data struct.	2019-10-02 06:42:48 -07:00
hwspinlock
hwtracing
i2c	i2c: slave-eeprom: Add read only mode	2019-09-28 20:44:12 +02:00
i3c
ide
idle
iio	First set of IIO fixes for the 5.4 cycle.	2019-10-10 11:18:37 +02:00
infiniband	RDMA/mlx5: Add missing synchronize_srcu() for MW cases	2019-10-04 15:54:22 -03:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2019-10-17 11:18:44 -07:00
interconnect
iommu	iommu/amd: Check PM_LEVEL_SIZE() condition in locked section	2019-10-18 16:52:37 +02:00
ipack
irqchip	Main MIPS changes for v5.4:	2019-09-22 09:30:30 -07:00
isdn	net: use skb_queue_empty_lockless() in poll() handlers	2019-10-28 13:33:41 -07:00
leds
lightnvm
macintosh
mailbox
mcb
md	for-linus-2019-10-18	2019-10-18 22:29:36 -04:00
media	media: stkwebcam: fix runtime PM after driver unbind	2019-10-04 14:38:46 +02:00
memory
memstick	memstick: jmb38x_ms: Fix an error handling path in 'jmb38x_ms_probe()'	2019-10-09 11:08:03 +02:00
message
mfd	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal	2019-09-29 10:24:23 -07:00
misc	misc: fastrpc: prevent memory leak in fastrpc_dma_buf_attach	2019-10-04 18:22:14 +02:00
mmc	mmc: sdhci-iproc: fix spurious interrupts on Multiblock reads with bcm2711	2019-10-09 11:05:50 +02:00
mtd	mtd: rawnand: au1550nd: Fix au_read_buf16() prototype	2019-10-07 09:56:36 +02:00
mux
net	net: mscc: ocelot: refuse to overwrite the port's native vlan	2019-10-29 16:22:07 -07:00
nfc	NFC: pn533: fix use-after-free and memleaks	2019-10-08 16:52:26 -07:00
ntb	NTB: fix IDT Kconfig typos/spellos	2019-09-23 17:20:40 -04:00
nubus
nvdimm	libnvdimm fixes v5.4-rc1	2019-09-29 10:33:41 -07:00
nvme	net: use skb_queue_empty_lockless() in busy poll contexts	2019-10-28 13:33:41 -07:00
nvmem
of	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-09-28 17:47:33 -07:00
opp
oprofile
parisc	parisc: Remove 32-bit DMA enforcement from sba_iommu	2019-10-14 21:44:26 +02:00
parport
pci	PCI: PM: Fix pci_power_up()	2019-10-15 23:51:36 +02:00
pcmcia	Merge branch 'next-lockdown' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2019-09-28 08:14:15 -07:00
perf
phy	pci-v5.4-changes	2019-09-23 19:16:01 -07:00
pinctrl	This is the bulk of pin control changes for the v5.4 kernel	2019-09-19 14:19:33 -07:00
platform	platform/x86: i2c-multi-instantiate: Fail the probe if no IRQ provided	2019-10-14 15:31:50 +03:00
pnp
power	power supply and reset changes for the v5.4 series	2019-09-22 12:04:59 -07:00
powercap
pps
ps3
ptp	ptp: fix typo of "mechanism" in Kconfig help text	2019-10-07 14:55:46 -04:00
pwm	pwm: Changes for v5.4-rc1	2019-09-27 12:19:47 -07:00
rapidio
ras
regulator
remoteproc	remoteproc updates for v5.4	2019-09-22 10:55:08 -07:00
reset	ARM: SoC fixes	2019-09-30 10:04:28 -07:00
rpmsg
rtc	RTC for 5.4	2019-09-22 11:05:43 -07:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-10-19 17:09:11 -04:00
sbus
scsi	Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>	2019-10-18 08:08:53 -07:00
sfi
sh
siox
slimbus
soc
soundwire	soundwire updates for v5.4-rc1	2019-09-22 10:52:23 -07:00
spi
spmi
ssb
staging	Staging/IIO driver fixes for 5.4-rc3	2019-10-12 15:44:46 -07:00
target	mm: introduce page_size()	2019-09-24 15:54:08 -07:00
tc
tee	tee/shm: untag user pointers in tee_shm_register	2019-09-25 17:51:41 -07:00
thermal	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal	2019-09-29 10:24:23 -07:00
thunderbolt
tty	tty: serial: imx: Use platform_get_irq_optional() for optional IRQs	2019-10-10 13:12:28 +02:00
uio
usb	USB: yurex: fix NULL-derefs on disconnect	2019-10-10 14:24:06 +02:00
vfio	vfio/type1: untag user pointers in vaddr_get_pfn	2019-09-25 17:51:41 -07:00
vhost	vhost/test: stop device before reset	2019-10-13 09:38:27 -04:00
video	video/logo: do not generate unneeded logo C files	2019-10-05 15:29:49 +09:00
virt	virt: vbox: fix memory leak in hgcm_call_preprocess_linaddr	2019-10-10 14:50:32 +02:00
virtio
visorbus
vlynq
vme
w1	w1: ds250x: Fix build error without CRC16	2019-10-10 15:35:41 +02:00
watchdog	linux-watchdog 5.4-rc1 tag	2019-09-27 11:17:38 -07:00
xen	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-10-19 17:09:11 -04:00
zorro
Kconfig
Makefile