diff options
| author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2009-02-21 06:04:28 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-02-27 20:52:56 +0100 |
| commit | 915278e099e532f3a874764e28c81958f788b9f1 (patch) | |
| tree | 5e5e58da553b4a72dd3c7f253d74ea555d275565 /net/wireless/reg.c | |
| parent | cfg80211: protect first access of last_request on 11d hint under mutex (diff) | |
| download | linux-915278e099e532f3a874764e28c81958f788b9f1.tar.xz linux-915278e099e532f3a874764e28c81958f788b9f1.zip | |
cfg80211: remove likely from an 11d hint case
Truth of the matter this was confusing people so mark it as
unlikely as that is the case now.
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/reg.c')
| -rw-r--r-- | net/wireless/reg.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index b47445219a48..baf50cac6e0a 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -1331,14 +1331,16 @@ void regulatory_hint_11d(struct wiphy *wiphy, if (!rd) goto out; - /* This will not happen right now but we leave it here for the + /* + * This will not happen right now but we leave it here for the * the future when we want to add suspend/resume support and having * the user move to another country after doing so, or having the user - * move to another AP. Right now we just trust the first AP. This is why - * this is marked as likley(). If we hit this before we add this support - * we want to be informed of it as it would indicate a mistake in the - * current design */ - if (likely(WARN_ON(reg_same_country_ie_hint(wiphy, checksum)))) + * move to another AP. Right now we just trust the first AP. + * + * If we hit this before we add this support we want to be informed of + * it as it would indicate a mistake in the current design + */ + if (WARN_ON(reg_same_country_ie_hint(wiphy, checksum))) goto out; /* We keep this around for when CRDA comes back with a response so |