diff --git a/[refs] b/[refs] index 28ee51d673ce..1f16df46534b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7b86bfe8d9f10e5a9fcacf52dddf29d0d58a33b +refs/heads/master: 47b70db5558388b3f4ecd10b492a0b3f6d680789 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 09cb3f6dc40c..b4978e2d6ddf 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -6264,7 +6264,6 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char goto out; /* Ensure the device has been registrered */ - err = -EINVAL; if (dev->reg_state != NETREG_REGISTERED) goto out;