aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/b43
diff options
context:
space:
mode:
authorMichael Buesch <mb@bu3sch.de>2008-04-18 15:06:37 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-04-23 21:25:34 -0400
commita259d6a45b915e00e8c6085e35fea7b61e3008a8 (patch)
treed66c8e86d80beda10400d6ec5b9264ce05dffe42 /drivers/net/wireless/b43
parent1855ba7812dbd294fcfc083dc7d3b14d3b1f38db (diff)
b43: Fix HostFlags data types
The HostFlags are a bitmask of 48bit. So we must use an u64 datatype to hold all bits. Signed-off-by: Michael Buesch <mb@bu3sch.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/b43')
-rw-r--r--drivers/net/wireless/b43/main.c5
-rw-r--r--drivers/net/wireless/b43/phy.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 4bc053ffc37e..a90e902f4b3e 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -3710,7 +3710,7 @@ static void setup_struct_wldev_for_init(struct b43_wldev *dev)
3710static void b43_bluetooth_coext_enable(struct b43_wldev *dev) 3710static void b43_bluetooth_coext_enable(struct b43_wldev *dev)
3711{ 3711{
3712 struct ssb_sprom *sprom = &dev->dev->bus->sprom; 3712 struct ssb_sprom *sprom = &dev->dev->bus->sprom;
3713 u32 hf; 3713 u64 hf;
3714 3714
3715 if (!modparam_btcoex) 3715 if (!modparam_btcoex)
3716 return; 3716 return;
@@ -3860,7 +3860,8 @@ static int b43_wireless_core_init(struct b43_wldev *dev)
3860 struct ssb_sprom *sprom = &bus->sprom; 3860 struct ssb_sprom *sprom = &bus->sprom;
3861 struct b43_phy *phy = &dev->phy; 3861 struct b43_phy *phy = &dev->phy;
3862 int err; 3862 int err;
3863 u32 hf, tmp; 3863 u64 hf;
3864 u32 tmp;
3864 3865
3865 B43_WARN_ON(b43_status(dev) != B43_STAT_UNINIT); 3866 B43_WARN_ON(b43_status(dev) != B43_STAT_UNINIT);
3866 3867
diff --git a/drivers/net/wireless/b43/phy.c b/drivers/net/wireless/b43/phy.c
index 575c5436ebdf..de024dc03718 100644
--- a/drivers/net/wireless/b43/phy.c
+++ b/drivers/net/wireless/b43/phy.c
@@ -2043,7 +2043,7 @@ int b43_phy_init(struct b43_wldev *dev)
2043void b43_set_rx_antenna(struct b43_wldev *dev, int antenna) 2043void b43_set_rx_antenna(struct b43_wldev *dev, int antenna)
2044{ 2044{
2045 struct b43_phy *phy = &dev->phy; 2045 struct b43_phy *phy = &dev->phy;
2046 u32 hf; 2046 u64 hf;
2047 u16 tmp; 2047 u16 tmp;
2048 int autodiv = 0; 2048 int autodiv = 0;
2049 2049