projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'dts-subdirs-for-arm-soc-v3.19' of git://git.kernel.org/pub/scm/linux/kerne...
[cascardo/linux.git]
/
net
/
dsa
/
dsa.c
diff --git
a/net/dsa/dsa.c
b/net/dsa/dsa.c
index
22f34cf
..
6317b41
100644
(file)
--- a/
net/dsa/dsa.c
+++ b/
net/dsa/dsa.c
@@
-174,8
+174,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;