diff options
| author | David S. Miller <davem@davemloft.net> | 2011-11-04 17:14:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-04 17:14:34 -0400 |
| commit | 39b02648d251dbfa27b576d55eeab4cc62228d86 (patch) | |
| tree | c442c1edb4242667d65340c20adee7da7afb66c2 /include | |
| parent | 1583171492eb514e267c7b51e96846b38de0f544 (diff) | |
| parent | 22097fd297c85ec6c2e700d506f231f7cae442e1 (diff) | |
| download | linux-39b02648d251dbfa27b576d55eeab4cc62228d86.tar.bz2 | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/bluetooth/rfcomm.h | 1 | ||||
| -rw-r--r-- | include/net/mac80211.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/net/bluetooth/rfcomm.h b/include/net/bluetooth/rfcomm.h index d5eee2093b1e..e2e3ecad1008 100644 --- a/include/net/bluetooth/rfcomm.h +++ b/include/net/bluetooth/rfcomm.h @@ -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 diff --git a/include/net/mac80211.h b/include/net/mac80211.h index dc1123aa8181..72eddd1b410b 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -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; } |