diff --git a/[refs] b/[refs] index 4975a80f9806..7043ae2b348d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c6ae5b880b3d19cff6d14f0dcff3362e6f7ffdf +refs/heads/master: a160ee69c6a4622ed30c377a978554015e9931cb diff --git a/trunk/net/core/net-sysfs.c b/trunk/net/core/net-sysfs.c index 821d30918cfc..427ded841224 100644 --- a/trunk/net/core/net-sysfs.c +++ b/trunk/net/core/net-sysfs.c @@ -366,13 +366,13 @@ static ssize_t wireless_show(struct device *d, char *buf, const struct iw_statistics *iw; ssize_t ret = -EINVAL; - read_lock(&dev_base_lock); + rtnl_lock(); if (dev_isalive(dev)) { iw = get_wireless_stats(dev); if (iw) ret = (*format)(iw, buf); } - read_unlock(&dev_base_lock); + rtnl_unlock(); return ret; }