diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2011-07-07 12:58:25 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-07-08 11:42:24 -0400 |
commit | 58eb7ff3dc056c6935c1cedee365ccf554000f45 (patch) | |
tree | 235e0af5c2ac49240e58592ccc425927d0783312 | |
parent | 8b9bda759e5b7c042c2b3ae852aaa332c0ee4495 (diff) |
b43: LCN-PHY: include new PHY in common code
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/b43/phy_common.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/b43/phy_common.h | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43/phy_common.c b/drivers/net/wireless/b43/phy_common.c index 9705950f059a..101957512bcc 100644 --- a/drivers/net/wireless/b43/phy_common.c +++ b/drivers/net/wireless/b43/phy_common.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include "phy_n.h" | 32 | #include "phy_n.h" |
33 | #include "phy_lp.h" | 33 | #include "phy_lp.h" |
34 | #include "phy_ht.h" | 34 | #include "phy_ht.h" |
35 | #include "phy_lcn.h" | ||
35 | #include "b43.h" | 36 | #include "b43.h" |
36 | #include "main.h" | 37 | #include "main.h" |
37 | 38 | ||
@@ -65,6 +66,11 @@ int b43_phy_allocate(struct b43_wldev *dev) | |||
65 | phy->ops = &b43_phyops_ht; | 66 | phy->ops = &b43_phyops_ht; |
66 | #endif | 67 | #endif |
67 | break; | 68 | break; |
69 | case B43_PHYTYPE_LCN: | ||
70 | #ifdef CONFIG_B43_PHY_LCN | ||
71 | phy->ops = &b43_phyops_lcn; | ||
72 | #endif | ||
73 | break; | ||
68 | } | 74 | } |
69 | if (B43_WARN_ON(!phy->ops)) | 75 | if (B43_WARN_ON(!phy->ops)) |
70 | return -ENODEV; | 76 | return -ENODEV; |
diff --git a/drivers/net/wireless/b43/phy_common.h b/drivers/net/wireless/b43/phy_common.h index 47dcb800a3c3..aa77ba612a92 100644 --- a/drivers/net/wireless/b43/phy_common.h +++ b/drivers/net/wireless/b43/phy_common.h | |||
@@ -195,6 +195,7 @@ struct b43_phy_g; | |||
195 | struct b43_phy_n; | 195 | struct b43_phy_n; |
196 | struct b43_phy_lp; | 196 | struct b43_phy_lp; |
197 | struct b43_phy_ht; | 197 | struct b43_phy_ht; |
198 | struct b43_phy_lcn; | ||
198 | 199 | ||
199 | struct b43_phy { | 200 | struct b43_phy { |
200 | /* Hardware operation callbacks. */ | 201 | /* Hardware operation callbacks. */ |
@@ -219,6 +220,8 @@ struct b43_phy { | |||
219 | struct b43_phy_lp *lp; | 220 | struct b43_phy_lp *lp; |
220 | /* HT-PHY specific information */ | 221 | /* HT-PHY specific information */ |
221 | struct b43_phy_ht *ht; | 222 | struct b43_phy_ht *ht; |
223 | /* LCN-PHY specific information */ | ||
224 | struct b43_phy_lcn *lcn; | ||
222 | }; | 225 | }; |
223 | 226 | ||
224 | /* Band support flags. */ | 227 | /* Band support flags. */ |