evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dsa-next'

Browse source 
Florian Fainelli says:

====================
net: DSA fixes for bridge and ip-autoconf

These two patches address some real world use cases of the DSA master and slave
network devices.

You have already seen patch 1 previously and you rejected it since my
explanations were not good enough to provide a justification as to why it is
useful, hopefully this time my explanation is better.

Patch 2 solves a different, yet very real problem as well at the bridge layer
when using DSA network devices.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2015-01-19 15:45:16 -05:00
commit cbcd1fa72c
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
net/bridge/br_if.c
View file

@ -436,10 +436,16 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
int err = 0; int err = 0;
bool changed_addr; bool changed_addr;
/* Don't allow bridging non-ethernet like devices */ /* Don't allow bridging non-ethernet like devices, or DSA-enabled
* master network devices since the bridge layer rx_handler prevents
* the DSA fake ethertype handler to be invoked, so we do not strip off
* the DSA switch tag protocol header and the bridge layer just return
* RX_HANDLER_CONSUMED, stopping RX processing for these frames.
*/
if ((dev->flags & IFF_LOOPBACK) || if ((dev->flags & IFF_LOOPBACK) ||
dev->type != ARPHRD_ETHER || dev->addr_len != ETH_ALEN || dev->type != ARPHRD_ETHER || dev->addr_len != ETH_ALEN ||
!is_valid_ether_addr(dev->dev_addr)) !is_valid_ether_addr(dev->dev_addr) ||
netdev_uses_dsa(dev))
return -EINVAL; return -EINVAL;
/* No bridging of bridges */ /* No bridging of bridges */

6
net/ipv4/ipconfig.c
View file

@ -209,9 +209,9 @@ static int __init ic_open_devs(void)
last = &ic_first_dev; last = &ic_first_dev;
rtnl_lock(); rtnl_lock();
/* bring loopback device up first */ /* bring loopback and DSA master network devices up first */
for_each_netdev(&init_net, dev) { for_each_netdev(&init_net, dev) {
if (!(dev->flags & IFF_LOOPBACK)) if (!(dev->flags & IFF_LOOPBACK) && !netdev_uses_dsa(dev))
continue; continue;
if (dev_change_flags(dev, dev->flags | IFF_UP) < 0) if (dev_change_flags(dev, dev->flags | IFF_UP) < 0)
pr_err("IP-Config: Failed to open %s\n", dev->name); pr_err("IP-Config: Failed to open %s\n", dev->name);
@ -306,7 +306,7 @@ static void __init ic_close_devs(void)
while ((d = next)) { while ((d = next)) {
next = d->next; next = d->next;
dev = d->dev; dev = d->dev;
if (dev != ic_dev) { if (dev != ic_dev && !netdev_uses_dsa(dev)) {
DBG(("IP-Config: Downing %s\n", dev->name)); DBG(("IP-Config: Downing %s\n", dev->name));
dev_change_flags(dev, d->flags); dev_change_flags(dev, d->flags);
} }