From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 22 Nov 2020 11:42:15 +0000 (+0100)
Subject: fix up merge issue with queue-4.4/net-have-netpoll-bring-up-dsa-management-interface... 
X-Git-Tag: v4.4.246~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=10c0dfabfeb9e3e3f4a513bbd4779f5604729bc4;p=thirdparty%2Fkernel%2Fstable-queue.git

fix up merge issue with queue-4.4/net-have-netpoll-bring-up-dsa-management-interface.patch
---

diff --git a/queue-4.4/net-have-netpoll-bring-up-dsa-management-interface.patch b/queue-4.4/net-have-netpoll-bring-up-dsa-management-interface.patch
index c653a71a9f5..e60605e1d22 100644
--- a/queue-4.4/net-have-netpoll-bring-up-dsa-management-interface.patch
+++ b/queue-4.4/net-have-netpoll-bring-up-dsa-management-interface.patch
@@ -52,7 +52,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	rtnl_lock();
 -	if (np->dev_name) {
 -		struct net *net = current->nsproxy->net_ns;
-++	if (np->dev_name)
++	if (np->dev_name)
  		ndev = __dev_get_by_name(net, np->dev_name);
 -	}
 +