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

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 c653a71a9f5f7950715ec40d658c842a13c2178c..e60605e1d220054537901365a258b7fa6a4412ca 100644 (file)
--- 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);
 -      }
 +