diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-12-19 18:54:26 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-12-19 18:54:26 (GMT) |
| commit | 9f6e20cee6253c4ca5faacba8dbd09ebe70132ed (patch) | |
| tree | 0dbcdabca91864daaf174bb014a5f46316880403 /drivers/net/wireless/ath/ath.h | |
| parent | d1d182e00d72300e05b18e28372fab003d8d4a58 (diff) | |
| parent | 5bd5e9a6ae5137a61d0b5c277eac61892d89fc4f (diff) | |
| download | linux-fsl-qoriq-9f6e20cee6253c4ca5faacba8dbd09ebe70132ed.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/ath/ath.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h index 4596c33..c1d699f 100644 --- a/drivers/net/wireless/ath/ath.h +++ b/drivers/net/wireless/ath/ath.h @@ -152,6 +152,7 @@ struct ath_common { struct ath_cycle_counters cc_survey; struct ath_regulatory regulatory; + struct ath_regulatory reg_world_copy; const struct ath_ops *ops; const struct ath_bus_ops *bus_ops; @@ -214,6 +215,10 @@ do { \ * @ATH_DBG_HWTIMER: hardware timer handling * @ATH_DBG_BTCOEX: bluetooth coexistance * @ATH_DBG_BSTUCK: stuck beacons + * @ATH_DBG_MCI: Message Coexistence Interface, a private protocol + * used exclusively for WLAN-BT coexistence starting from + * AR9462. + * @ATH_DBG_DFS: radar datection * @ATH_DBG_ANY: enable all debugging * * The debug level is used to control the amount and type of debugging output @@ -240,6 +245,7 @@ enum ATH_DEBUG { ATH_DBG_WMI = 0x00004000, ATH_DBG_BSTUCK = 0x00008000, ATH_DBG_MCI = 0x00010000, + ATH_DBG_DFS = 0x00020000, ATH_DBG_ANY = 0xffffffff }; |