diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-11-16 12:50:25 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-11-16 12:50:25 +0300 |
| commit | e9ac5f0fa8549dffe2a15870217a9c2e7cd557ec (patch) | |
| tree | 863e0e108f7b7ba2dffc7575bbdfc2d454fc2017 /net/dsa/dsa.c | |
| parent | 44dba3d5d6a10685fb15bd1954e62016334825e0 (diff) | |
| parent | 6e998916dfe327e785e7c2447959b2c1a3ea4930 (diff) | |
| download | linux-e9ac5f0fa8549dffe2a15870217a9c2e7cd557ec.tar.xz | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes before applying more changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/dsa/dsa.c')
| -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 22f34cf4cb27..6317b41c99b0 100644 --- 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; |