Florian Fainelli 5aed85cec2 net: dsa: allow switches to work without tagging ...

In case switch port tagging is disabled (voluntarily, or the switch just
does not support it), allow us to continue using the defined set of
dsa_device_ops in net/dsa/slave.c.

We introduce dsa_protocol_is_tagged() to check whether we need to
override skb->protocol and go through the DSA-specifif packet_type
function, or if we just go on and receive the SKB through the normal
path.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2014-08-27 22:59:40 -07:00

..

acpi

Merge tag 'pm+acpi-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2014-08-06 20:34:19 -07:00

asm-generic

Merge tag 'gpio-v3.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio

2014-08-08 18:00:35 -07:00

clocksource

ARM: pxa: Add non device-tree timer link to clocksource

2014-07-23 12:02:39 +02:00

crypto

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

2014-08-06 08:06:39 -07:00

drm

Merge branch 'linux-3.17' of git://anongit.freedesktop.org/git/nouveau/linux-2.6

2014-08-09 17:46:39 -07:00

dt-bindings

Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

2014-08-11 07:14:01 -07:00

keys

Merge remote-tracking branch 'integrity/next-with-keys' into keys-next

2014-07-22 21:54:43 +01:00

kvm

KVM: ARM: vgic: add the GICv3 backend

2014-07-11 04:57:36 -07:00

linux

net: dsa: allow switches to work without tagging

2014-08-27 22:59:40 -07:00

math-emu

…

media

[media] media: atmel-isi: add v4l2 async probe support

2014-07-30 19:35:06 -03:00

memory

…

misc

…

net

net: dsa: allow switches to work without tagging

2014-08-27 22:59:40 -07:00

pcmcia

…

ras

…

rdma

Merge branches 'core', 'cxgb4', 'ipoib', 'iser', 'iwcm', 'mad', 'misc', 'mlx4', 'mlx5', 'ocrdma' and 'srp' into for-next

2014-08-14 08:58:04 -07:00

rxrpc

…

scsi

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2014-08-15 18:28:58 -06:00

soc/tegra

ARM: tegra: Convert PMC to a driver

2014-07-17 14:58:43 +02:00

sound

Merge tag 'asoc-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

2014-08-04 18:28:21 +02:00

target

…

trace

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

2014-08-14 10:14:07 -06:00

uapi

net: dsa: reduce number of protocol hooks

2014-08-27 22:59:39 -07:00

video

Merge tag 'fbdev-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

2014-08-08 18:09:33 -07:00

xen

Merge tag 'stable/for-linus-3.17-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

2014-08-07 11:33:15 -07:00

Kbuild

…