GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-23 07:12:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse source 
Conflicts:
	drivers/net/phy/marvell.c

Simple overlapping changes in drivers/net/phy/marvell.c

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2014-11-01 14:53:27 -04:00
commit 55b42b5ca2
884 changed files with 18925 additions and 8431 deletions
Download patch file Download diff file Expand all files Collapse all files

5
net/dsa/dsa.c
View file

@ -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;