diff options
| author | David S. Miller <davem@davemloft.net> | 2017-06-10 23:06:46 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-10 23:06:46 +0200 |
| commit | 95c4629d92d15d10e5f7c55bfb72583f96a91374 (patch) | |
| tree | ef9b973bfbf9f85659f4fc2794d8271bd19c4857 /net/dsa/dsa2.c | |
| parent | Merge branch 'sparc64-queued-locks' (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
| download | linux-95c4629d92d15d10e5f7c55bfb72583f96a91374.tar.xz linux-95c4629d92d15d10e5f7c55bfb72583f96a91374.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Diffstat (limited to 'net/dsa/dsa2.c')
| -rw-r--r-- | net/dsa/dsa2.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index 033b3bfb63dc..7796580e99ee 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@ -484,8 +484,10 @@ static void dsa_dst_unapply(struct dsa_switch_tree *dst) dsa_ds_unapply(dst, ds); } - if (dst->cpu_switch) + if (dst->cpu_switch) { dsa_cpu_port_ethtool_restore(dst->cpu_switch); + dst->cpu_switch = NULL; + } pr_info("DSA: tree %d unapplied\n", dst->tree); dst->applied = false; |