xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Two AF_* families adding entries to the lockdep tables
at the same time.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2017-01-11 14:43:39 -05:00
parent 265592a1df ba836a6f5a
commit 02ac5d1487
101 changed files with 778 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
net/dsa/dsa2.c
View File

@@ -378,9 +378,11 @@ static int dsa_dst_apply(struct dsa_switch_tree *dst)
return err;
}
err = dsa_cpu_port_ethtool_setup(dst->ds[0]);
if (err)
return err;
if (dst->ds[0]) {
err = dsa_cpu_port_ethtool_setup(dst->ds[0]);
if (err)
return err;
}
/* If we use a tagging format that doesn't have an ethertype
* field, make sure that all packets from this point on get
@@ -417,7 +419,8 @@ static void dsa_dst_unapply(struct dsa_switch_tree *dst)
dsa_ds_unapply(dst, ds);
}
dsa_cpu_port_ethtool_restore(dst->ds[0]);
if (dst->ds[0])
dsa_cpu_port_ethtool_restore(dst->ds[0]);
pr_info("DSA: tree %d unapplied\n", dst->tree);
dst->applied = false;