From 2dfffc02359078672b12bf69a32ad7ff97b5914f Mon Sep 17 00:00:00 2001 From: Yuri Ershov Date: Tue, 29 Jun 2010 15:08:08 +0400 Subject: [PATCH] --- yaml --- r: 203927 b: refs/heads/master c: c4c322941ce0d7e2b7b8794ad70683123d9cb26a h: refs/heads/master i: 203925: 1d4502cd8bc8fd45980e7441dfdaa59f601e21c5 203923: 9e796459a6ca286ab5c2d0e727bbbce6173d2096 203919: fdf294c1b72c0f41a38b0f20105366276f3361cb v: v3 --- [refs] | 2 +- trunk/net/wireless/reg.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fc41010182b5..e9a0ff4bab55 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d080e2755d840ede60128cc914a070868ebabc1e +refs/heads/master: c4c322941ce0d7e2b7b8794ad70683123d9cb26a diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c index ec4e76f95044..f180db0de66c 100644 --- a/trunk/net/wireless/reg.c +++ b/trunk/net/wireless/reg.c @@ -1306,6 +1306,7 @@ static void reg_process_hint(struct regulatory_request *reg_request) { int r = 0; struct wiphy *wiphy = NULL; + enum nl80211_reg_initiator initiator = reg_request->initiator; BUG_ON(!reg_request->alpha2); @@ -1325,7 +1326,7 @@ static void reg_process_hint(struct regulatory_request *reg_request) /* This is required so that the orig_* parameters are saved */ if (r == -EALREADY && wiphy && wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY) - wiphy_update_regulatory(wiphy, reg_request->initiator); + wiphy_update_regulatory(wiphy, initiator); out: mutex_unlock(®_mutex); mutex_unlock(&cfg80211_mutex);