From: David S. Miller <davem@davemloft.net>
Date: Wed, 7 Jun 2017 02:20:08 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=216fe8f021e33c36e3b27c49c9f1951f6b037d7f;p=openwrt%2Fstaging%2Fblogic.git

Merge git://git./linux/kernel/git/davem/net

Just some simple overlapping changes in marvell PHY driver
and the DSA core code.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

216fe8f021e33c36e3b27c49c9f1951f6b037d7f
diff --cc net/dsa/dsa2.c
index cd13bb54a30c,7796580e99ee..f88e1dddb74a
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@@ -474,8 -484,10 +474,10 @@@ static void dsa_dst_unapply(struct dsa_
  		dsa_ds_unapply(dst, ds);
  	}
  
- 	if (dst->cpu_dp)
 -	if (dst->cpu_switch) {
 -		dsa_cpu_port_ethtool_restore(dst->cpu_switch);
 -		dst->cpu_switch = NULL;
++	if (dst->cpu_dp) {
 +		dsa_cpu_port_ethtool_restore(dst->cpu_dp);
++		dst->cpu_dp = NULL;
+ 	}
  
  	pr_info("DSA: tree %d unapplied\n", dst->tree);
  	dst->applied = false;