diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 08:09:09 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 08:09:09 -0700 |
| commit | 0ccd8c39bc664bf5e9fcc26caad50cc17ff866d1 (patch) | |
| tree | 29cec0edf3acf18c6978b750a8d6560f445df6df /drivers/net/wireless/ath5k/base.h | |
| parent | 1625324d22409e32e3f8eb86018cad72e1c09d61 (diff) | |
| parent | ec0c15afb41fd9ad45b53468b60db50170e22346 (diff) | |
Merge branch 'linus' into x86/core
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 d7e03e6b827..7ec2f377d5c 100644 --- a/drivers/net/wireless/ath5k/base.h +++ b/drivers/net/wireless/ath5k/base.h @@ -172,6 +172,7 @@ struct ath5k_softc { struct tasklet_struct txtq; /* tx intr tasklet */ struct ath5k_led tx_led; /* tx led */ + spinlock_t block; /* protects beacon */ struct ath5k_buf *bbuf; /* beacon buffer */ unsigned int bhalq, /* SW q for outgoing beacons */ bmisscount, /* missed beacon transmits */ |