From 20a7cdc9dde2b897413cb65549ac201a41326a35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Thu, 7 Jul 2011 18:58:25 +0200 Subject: [PATCH] --- yaml --- r: 256359 b: refs/heads/master c: 58eb7ff3dc056c6935c1cedee365ccf554000f45 h: refs/heads/master i: 256357: 0c775be995592b79676d9459f1ff02620f628973 256355: ca77921e23fa9c97a62e517008659e380ef2537d 256351: 4a15ac6cd1e67660b2047a32f8b0430d4639661a v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/b43/phy_common.c | 6 ++++++ trunk/drivers/net/wireless/b43/phy_common.h | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0a626a146174..ba69a31e6fa6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b9bda759e5b7c042c2b3ae852aaa332c0ee4495 +refs/heads/master: 58eb7ff3dc056c6935c1cedee365ccf554000f45 diff --git a/trunk/drivers/net/wireless/b43/phy_common.c b/trunk/drivers/net/wireless/b43/phy_common.c index 9705950f059a..101957512bcc 100644 --- a/trunk/drivers/net/wireless/b43/phy_common.c +++ b/trunk/drivers/net/wireless/b43/phy_common.c @@ -32,6 +32,7 @@ #include "phy_n.h" #include "phy_lp.h" #include "phy_ht.h" +#include "phy_lcn.h" #include "b43.h" #include "main.h" @@ -63,6 +64,11 @@ int b43_phy_allocate(struct b43_wldev *dev) case B43_PHYTYPE_HT: #ifdef CONFIG_B43_PHY_HT phy->ops = &b43_phyops_ht; +#endif + break; + case B43_PHYTYPE_LCN: +#ifdef CONFIG_B43_PHY_LCN + phy->ops = &b43_phyops_lcn; #endif break; } diff --git a/trunk/drivers/net/wireless/b43/phy_common.h b/trunk/drivers/net/wireless/b43/phy_common.h index 47dcb800a3c3..aa77ba612a92 100644 --- a/trunk/drivers/net/wireless/b43/phy_common.h +++ b/trunk/drivers/net/wireless/b43/phy_common.h @@ -195,6 +195,7 @@ struct b43_phy_g; struct b43_phy_n; struct b43_phy_lp; struct b43_phy_ht; +struct b43_phy_lcn; struct b43_phy { /* Hardware operation callbacks. */ @@ -219,6 +220,8 @@ struct b43_phy { struct b43_phy_lp *lp; /* HT-PHY specific information */ struct b43_phy_ht *ht; + /* LCN-PHY specific information */ + struct b43_phy_lcn *lcn; }; /* Band support flags. */