]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
b43: Fix HostFlags data types
authorMichael Buesch <mb@bu3sch.de>
Fri, 18 Apr 2008 19:06:37 +0000 (21:06 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 24 Apr 2008 01:25:34 +0000 (21:25 -0400)
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>
drivers/net/wireless/b43/main.c
drivers/net/wireless/b43/phy.c

index 4bc053ffc37e85974f5a70b8976c897a133cf7cb..a90e902f4b3e2178de2faed69e1c67905d751bac 100644 (file)
@@ -3710,7 +3710,7 @@ static void setup_struct_wldev_for_init(struct b43_wldev *dev)
 static void b43_bluetooth_coext_enable(struct b43_wldev *dev)
 {
        struct ssb_sprom *sprom = &dev->dev->bus->sprom;
-       u32 hf;
+       u64 hf;
 
        if (!modparam_btcoex)
                return;
@@ -3860,7 +3860,8 @@ static int b43_wireless_core_init(struct b43_wldev *dev)
        struct ssb_sprom *sprom = &bus->sprom;
        struct b43_phy *phy = &dev->phy;
        int err;
-       u32 hf, tmp;
+       u64 hf;
+       u32 tmp;
 
        B43_WARN_ON(b43_status(dev) != B43_STAT_UNINIT);
 
index 575c5436ebdfdcdcfcd8ab56a8671c1da3dd0a9a..de024dc03718571296577a14bac34467b3ffd0f8 100644 (file)
@@ -2043,7 +2043,7 @@ int b43_phy_init(struct b43_wldev *dev)
 void b43_set_rx_antenna(struct b43_wldev *dev, int antenna)
 {
        struct b43_phy *phy = &dev->phy;
-       u32 hf;
+       u64 hf;
        u16 tmp;
        int autodiv = 0;