diff --git a/[refs] b/[refs] index 490941914547..b72f1de82239 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 71d3b0d592601f26be2233a7922d53e762516fee +refs/heads/master: 2d02c86b7720c2f0614ed838187b05a7ddb0ea83 diff --git a/trunk/drivers/net/wireless/b43/phy_ht.c b/trunk/drivers/net/wireless/b43/phy_ht.c index 28fb7464c318..69412d1fb655 100644 --- a/trunk/drivers/net/wireless/b43/phy_ht.c +++ b/trunk/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/trunk/drivers/net/wireless/b43/tables_phy_ht.h b/trunk/drivers/net/wireless/b43/tables_phy_ht.h index 6a136148edd7..ea3be382c894 100644 --- a/trunk/drivers/net/wireless/b43/tables_phy_ht.h +++ b/trunk/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_ */