Skip to content

Commit

Permalink
cfg80211: remove likely from an 11d hint case
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Luis R. Rodriguez authored and John W. Linville committed Feb 27, 2009
1 parent d335fe6 commit 915278e
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions net/wireless/reg.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 915278e

Please sign in to comment.