Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 134930
b: refs/heads/master
c: 0441d6f
h: refs/heads/master
v: v3
  • Loading branch information
Luis R. Rodriguez authored and John W. Linville committed Feb 27, 2009
1 parent ed73398 commit 22e211e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 915278e099e532f3a874764e28c81958f788b9f1
refs/heads/master: 0441d6ffc705de17d85923264a1b03b71ebfccb8
6 changes: 5 additions & 1 deletion trunk/net/wireless/reg.c
Original file line number Diff line number Diff line change
Expand Up @@ -1341,7 +1341,7 @@ void regulatory_hint_11d(struct wiphy *wiphy,
* it as it would indicate a mistake in the current design
*/
if (WARN_ON(reg_same_country_ie_hint(wiphy, checksum)))
goto out;
goto free_rd_out;

/* We keep this around for when CRDA comes back with a response so
* we can intersect with that */
Expand All @@ -1350,6 +1350,10 @@ void regulatory_hint_11d(struct wiphy *wiphy,
__regulatory_hint(wiphy, REGDOM_SET_BY_COUNTRY_IE,
country_ie_regdomain->alpha2, checksum, env);

goto out;

free_rd_out:
kfree(rd);
out:
mutex_unlock(&cfg80211_mutex);
}
Expand Down

0 comments on commit 22e211e

Please sign in to comment.