Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / wireless / ath / ath5k / base.h

diff --git a/drivers/net/wireless/ath/ath5k/base.h b/drivers/net/wireless/ath/ath5k/base.h
index 9a79773cdc2a43f59ccbddf2a53f51172e06d8a6..6d511476e4d2695c1b0a8edb1eac552620cd06eb 100644 (file)
--- a/drivers/net/wireless/ath/ath5k/base.h
+++ b/drivers/net/wireless/ath/ath5k/base.h
@@ -169,7 +169,10 @@ struct ath5k_vif {
 /* Software Carrier, keeps track of the driver state
  * associated with an instance of a device */
 struct ath5k_softc {
-       struct pci_dev          *pdev;          /* for dma mapping */
+       struct pci_dev          *pdev;
+       struct device           *dev;           /* for dma mapping */
+       int irq;
+       u16 devid;
        void __iomem            *iobase;        /* address of the device */
        struct mutex            lock;           /* dev-level lock */
        struct ieee80211_hw     *hw;            /* IEEE 802.11 common */
@@ -255,6 +258,8 @@ struct ath5k_softc {
        struct tasklet_struct   ani_tasklet;    /* ANI calibration */
 
        struct delayed_work     tx_complete_work;
+
+       struct survey_info      survey;         /* collected survey info */
 };
 
 #define ath5k_hw_hasbssidmask(_ah) \