diff --git a/[refs] b/[refs] index 7e226aea7480..d450d2fc71ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86bba269d08f0c545ae76c90b56727f65d62d57f +refs/heads/master: 9d5010db7ecfd6ec00119d3b185c4c0cd3265167 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 215b8e97690a..d16dcab49c60 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -1060,6 +1060,8 @@ int dev_open(struct net_device *dev) */ int dev_close(struct net_device *dev) { + might_sleep(); + if (!(dev->flags & IFF_UP)) return 0;