b43: LCN-PHY: add very basic PHY ops

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_lcn.c b/drivers/net/wireless/b43/phy_lcn.c
index 9f7dbbd5ced6eca964c3c61bbfefdb8b0838cdf3..03944ad13cfb7ccfd3de2ab009f8047fbb029a40 100644 (file)
--- a/drivers/net/wireless/b43/phy_lcn.c
+++ b/drivers/net/wireless/b43/phy_lcn.c
@@ -27,15 +27,65 @@
 #include "tables_phy_lcn.h"
 #include "main.h"
 
+/**************************************************
+ * Basic PHY ops.
+ **************************************************/
+
+static int b43_phy_lcn_op_allocate(struct b43_wldev *dev)
+{
+       struct b43_phy_lcn *phy_lcn;
+
+       phy_lcn = kzalloc(sizeof(*phy_lcn), GFP_KERNEL);
+       if (!phy_lcn)
+               return -ENOMEM;
+       dev->phy.lcn = phy_lcn;
+
+       return 0;
+}
+
+static void b43_phy_lcn_op_free(struct b43_wldev *dev)
+{
+       struct b43_phy *phy = &dev->phy;
+       struct b43_phy_lcn *phy_lcn = phy->lcn;
+
+       kfree(phy_lcn);
+       phy->lcn = NULL;
+}
+
+static void b43_phy_lcn_op_prepare_structs(struct b43_wldev *dev)
+{
+       struct b43_phy *phy = &dev->phy;
+       struct b43_phy_lcn *phy_lcn = phy->lcn;
+
+       memset(phy_lcn, 0, sizeof(*phy_lcn));
+}
+
+static unsigned int b43_phy_lcn_op_get_default_chan(struct b43_wldev *dev)
+{
+       if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ)
+               return 1;
+       return 36;
+}
+
+static enum b43_txpwr_result
+b43_phy_lcn_op_recalc_txpower(struct b43_wldev *dev, bool ignore_tssi)
+{
+       return B43_TXPWR_RES_DONE;
+}
+
+static void b43_phy_lcn_op_adjust_txpower(struct b43_wldev *dev)
+{
+}
+
 /**************************************************
  * PHY ops struct.
  **************************************************/
 
 const struct b43_phy_operations b43_phyops_lcn = {
-       /*
        .allocate               = b43_phy_lcn_op_allocate,
        .free                   = b43_phy_lcn_op_free,
        .prepare_structs        = b43_phy_lcn_op_prepare_structs,
+       /*
        .init                   = b43_phy_lcn_op_init,
        .phy_read               = b43_phy_lcn_op_read,
        .phy_write              = b43_phy_lcn_op_write,
@@ -45,8 +95,8 @@ const struct b43_phy_operations b43_phyops_lcn = {
        .software_rfkill        = b43_phy_lcn_op_software_rfkill,
        .switch_analog          = b43_phy_lcn_op_switch_analog,
        .switch_channel         = b43_phy_lcn_op_switch_channel,
+       */
        .get_default_chan       = b43_phy_lcn_op_get_default_chan,
        .recalc_txpower         = b43_phy_lcn_op_recalc_txpower,
        .adjust_txpower         = b43_phy_lcn_op_adjust_txpower,
-       */
 };

diff --git a/drivers/net/wireless/b43/phy_lcn.h b/drivers/net/wireless/b43/phy_lcn.h
index c046c2a6cab4aee16c4dfee664b2a9412e4273f3..9e1b291cca38c8f22736cbd3ace203af205ebbfd 100644 (file)
--- a/drivers/net/wireless/b43/phy_lcn.h
+++ b/drivers/net/wireless/b43/phy_lcn.h
@@ -11,4 +11,4 @@ struct b43_phy_lcn {
 struct b43_phy_operations;
 extern const struct b43_phy_operations b43_phyops_lcn;
 
-#endif /* B43_PHY_LCN_H_ */
\ No newline at end of file
+#endif /* B43_PHY_LCN_H_ */