diff options
| author | David S. Miller <davem@davemloft.net> | 2014-11-01 19:53:27 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-01 19:53:27 +0100 |
| commit | 55b42b5ca2dcf143465968697fe6c6503b05fca1 (patch) | |
| tree | 91878cd53efc44ba67244d4d3897020828c87c01 /net/dsa | |
| parent | drivers: net: cpsw: Support ALLMULTI and fix IFF_PROMISC in switch mode (diff) | |
| parent | sunhme: Add DMA mapping error checks. (diff) | |
| download | linux-55b42b5ca2dcf143465968697fe6c6503b05fca1.tar.xz linux-55b42b5ca2dcf143465968697fe6c6503b05fca1.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/phy/marvell.c
Simple overlapping changes in drivers/net/phy/marvell.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa')
| -rw-r--r-- | net/dsa/dsa.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index b51ef592f0a2..dd646a8025cb 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c @@ -276,8 +276,11 @@ dsa_switch_setup(struct dsa_switch_tree *dst, int index, dst->rcv = brcm_netdev_ops.rcv; break; #endif - default: + case DSA_TAG_PROTO_NONE: break; + default: + ret = -ENOPROTOOPT; + goto out; } dst->tag_protocol = drv->tag_protocol; |