b43: HT-PHY: basic PHY init

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/b43/phy_ht.c b/drivers/net/wireless/b43/phy_ht.c
index 28fb7464c318f4ec781d3559887dadd271edaff9..69412d1fb65577ef914706a4fdd840393f2b5548 100644 (file)
--- a/drivers/net/wireless/b43/phy_ht.c
+++ b/drivers/net/wireless/b43/phy_ht.c
@@ -205,6 +205,13 @@ static void b43_phy_ht_op_prepare_structs(struct b43_wldev *dev)
        memset(phy_ht, 0, sizeof(*phy_ht));
 }
 
+static int b43_phy_ht_op_init(struct b43_wldev *dev)
+{
+       b43_phy_ht_tables_init(dev);
+
+       return 0;
+}
+
 static void b43_phy_ht_op_free(struct b43_wldev *dev)
 {
        struct b43_phy *phy = &dev->phy;
@@ -326,9 +333,7 @@ const struct b43_phy_operations b43_phyops_ht = {
        .allocate               = b43_phy_ht_op_allocate,
        .free                   = b43_phy_ht_op_free,
        .prepare_structs        = b43_phy_ht_op_prepare_structs,
-       /*
        .init                   = b43_phy_ht_op_init,
-       */
        .phy_read               = b43_phy_ht_op_read,
        .phy_write              = b43_phy_ht_op_write,
        .phy_maskset            = b43_phy_ht_op_maskset,

diff --git a/drivers/net/wireless/b43/tables_phy_ht.h b/drivers/net/wireless/b43/tables_phy_ht.h
index 6a136148edd7d2adbc712ee5a2aaf5a6813dd4d8..ea3be382c8945b70e010925c94ad446c59a1a70a 100644 (file)
--- a/drivers/net/wireless/b43/tables_phy_ht.h
+++ b/drivers/net/wireless/b43/tables_phy_ht.h
@@ -17,4 +17,6 @@ void b43_httab_write(struct b43_wldev *dev, u32 offset, u32 value);
 void b43_httab_write_bulk(struct b43_wldev *dev, u32 offset,
                          unsigned int nr_elements, const void *_data);
 
+void b43_phy_ht_tables_init(struct b43_wldev *dev);
+
 #endif /* B43_TABLES_PHY_HT_H_ */