diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-30 02:06:00 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-30 02:06:00 -0400 |
| commit | b171e19ed08c8ba832e5325fadf1be493f56665d (patch) | |
| tree | 017208f9fcc4ef2cc3fe5cc3f262d2455eda9f61 /drivers/net/wireless/ath5k/base.h | |
| parent | 143b11c03cd42f2284efe5128afc057d8fc86c78 (diff) | |
| parent | 7c19a3d280297d43ef5ff7c6b205dc208a16d3d1 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/mlme.c
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 248e32eb6cb3..1549b63d6138 100644 --- a/drivers/net/wireless/ath5k/base.h +++ b/drivers/net/wireless/ath5k/base.h | |||
| @@ -168,6 +168,7 @@ struct ath5k_softc { | |||
| 168 | struct tasklet_struct txtq; /* tx intr tasklet */ | 168 | struct tasklet_struct txtq; /* tx intr tasklet */ |
| 169 | struct ath5k_led tx_led; /* tx led */ | 169 | struct ath5k_led tx_led; /* tx led */ |
| 170 | 170 | ||
| 171 | spinlock_t block; /* protects beacon */ | ||
| 171 | struct ath5k_buf *bbuf; /* beacon buffer */ | 172 | struct ath5k_buf *bbuf; /* beacon buffer */ |
| 172 | unsigned int bhalq, /* SW q for outgoing beacons */ | 173 | unsigned int bhalq, /* SW q for outgoing beacons */ |
| 173 | bmisscount, /* missed beacon transmits */ | 174 | bmisscount, /* missed beacon transmits */ |