Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

This commit is contained in:
David S. Miller 2011-11-04 17:14:34 -04:00
commit 39b02648d2
25 changed files with 126 additions and 94 deletions

View file

@ -211,6 +211,7 @@ struct rfcomm_dlc {
#define RFCOMM_AUTH_ACCEPT 6
#define RFCOMM_AUTH_REJECT 7
#define RFCOMM_DEFER_SETUP 8
#define RFCOMM_ENC_DROP 9
/* Scheduling flags and events */
#define RFCOMM_SCHED_WAKEUP 31

View file

@ -3567,8 +3567,9 @@ rate_lowest_index(struct ieee80211_supported_band *sband,
return i;
/* warn when we cannot find a rate. */
WARN_ON(1);
WARN_ON_ONCE(1);
/* and return 0 (the lowest index) */
return 0;
}