diff --git a/[refs] b/[refs] index 441cf8f86ba5..be1c9da33dce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c58f9f635afe688c5c5709f441af57c12c7a4856 +refs/heads/master: 0f70f398460adb2d8aabb00e7e65f58247f219a3 diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c index 9e5a9f975478..4f877535e666 100644 --- a/trunk/net/wireless/reg.c +++ b/trunk/net/wireless/reg.c @@ -989,6 +989,9 @@ void regulatory_hint_11d(struct wiphy *wiphy, u32 checksum = 0; enum environment_cap env = ENVIRON_ANY; + if (!last_request) + return; + mutex_lock(&cfg80211_drv_mutex); /* IE len must be evenly divisible by 2 */