diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-25 17:27:58 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-25 17:27:58 -0500 |
| commit | d7713ccc7bec64fbe0e4e39f93b17dfec711db7f (patch) | |
| tree | 586afddc7e21ecaa82fc9af369778e53de93fb4e /drivers/net/wireless/ath5k/base.h | |
| parent | 11c6dd2c723a9ff9bdd4ee11b2798a08abc94e98 (diff) | |
| parent | 020cf6ba7a91ccc5db359f91e9abba175fd3a0aa (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/ath5k/base.h')
| -rw-r--r-- | drivers/net/wireless/ath5k/base.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath5k/base.h b/drivers/net/wireless/ath5k/base.h index 06d1054ca94b..facc60ddada2 100644 --- a/drivers/net/wireless/ath5k/base.h +++ b/drivers/net/wireless/ath5k/base.h | |||
| @@ -179,6 +179,7 @@ struct ath5k_softc { | |||
| 179 | 179 | ||
| 180 | struct timer_list calib_tim; /* calibration timer */ | 180 | struct timer_list calib_tim; /* calibration timer */ |
| 181 | int power_level; /* Requested tx power in dbm */ | 181 | int power_level; /* Requested tx power in dbm */ |
| 182 | bool assoc; /* assocate state */ | ||
| 182 | }; | 183 | }; |
| 183 | 184 | ||
| 184 | #define ath5k_hw_hasbssidmask(_ah) \ | 185 | #define ath5k_hw_hasbssidmask(_ah) \ |