Skip to contentSkip to conversation

staging/wlan-ng: fix compile error updating to new NL80211

PATCH In review Javier Martinez Canillas 3 participants 4 messages Jul 1, 2010 – Aug 31, 2010

Subsystems (2)
Staging Kernel janitors
lore
Share & tools
lore

Javier Martinez Canillas

author
#0 lore raw

PATCH 1/1 staging/wlan-ng: fix compile error updating to new NL80211

Hello,

A few days ago I send this patch and didn't get any feedback. So I'm resending it.

In linux-next I got a compile error in wlan-ng:

CC [M] drivers/staging/wlan-ng/p80211netdev.o
In file included from drivers/staging/wlan-ng/p80211netdev.c:91:
drivers/staging/wlan-ng/cfg80211.c:602: warning: ‘enum tx_power_setting’ declared inside parameter list drivers/staging/wlan-ng/cfg80211.c:602: warning: its scope is only this definition or declaration, which is probably not what you want drivers/staging/wlan-ng/cfg80211.c:602: error: parameter 2 (‘type’) has incomplete type drivers/staging/wlan-ng/cfg80211.c: In function ‘prism2_set_tx_power’:
drivers/staging/wlan-ng/cfg80211.c:609: error: ‘TX_POWER_AUTOMATIC’ undeclared (first use in this function) drivers/staging/wlan-ng/cfg80211.c:609: error: (Each undeclared identifier is reported only once drivers/staging/wlan-ng/cfg80211.c:609: error: for each function it appears in.)
make[1]: *** [drivers/staging/wlan-ng/p80211netdev.o] Error 1
make: *** [_module_drivers/staging/wlan-ng] Error 2

The problem is that the 802.11 netlink interface changed and the driver was not updated

This patch solves the issue

Thanks a lot,

Signed-off-by Javier Martinez Canillas <[email protected]>
---
 drivers/staging/wlan-ng/cfg80211.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/wlan-ng/cfg80211.c +2 -2
index b0792f7..9803b28 100644
@@ -599,14 +599,14 @@ int prism2_leave_ibss(struct wiphy *wiphy, struct net_device *dev) {
 
 
 int prism2_set_tx_power(struct wiphy *wiphy,
-			enum tx_power_setting type, int dbm) {
+			enum nl80211_tx_power_setting type, int dbm) {
 	struct prism2_wiphy_private *priv = wiphy_priv(wiphy);
 	wlandevice_t *wlandev = priv->wlandev;
 	u32 data;
 	int result;
 	int err = 0;
 
-	if (type = TX_POWER_AUTOMATIC)
+	if (type = NL80211_TX_POWER_AUTOMATIC)
 		data = 30;
 	else
 		data = dbm;
Signature · 1 line
1.7.0.4
#1 lore raw

Re: [PATCH] staging/wlan-ng: fix compile error updating to new

Quoted 41 lines · Javier Martinez Canillas

Hello,

A few days ago I send this patch and didn't get any feedback. So I'm resending it.

In linux-next I got a compile error in wlan-ng:

CC [M] drivers/staging/wlan-ng/p80211netdev.o
In file included from drivers/staging/wlan-ng/p80211netdev.c:91:
drivers/staging/wlan-ng/cfg80211.c:602: warning: ‘enum tx_power_setting’ declared inside parameter list drivers/staging/wlan-ng/cfg80211.c:602: warning: its scope is only this definition or declaration, which is probably not what you want drivers/staging/wlan-ng/cfg80211.c:602: error: parameter 2 (‘type’) has incomplete type drivers/staging/wlan-ng/cfg80211.c: In function ‘prism2_set_tx_power’:
drivers/staging/wlan-ng/cfg80211.c:609: error: ‘TX_POWER_AUTOMATIC’ undeclared (first use in this function) drivers/staging/wlan-ng/cfg80211.c:609: error: (Each undeclared identifier is reported only once drivers/staging/wlan-ng/cfg80211.c:609: error: for each function it appears in.)
make[1]: *** [drivers/staging/wlan-ng/p80211netdev.o] Error 1
make: *** [_module_drivers/staging/wlan-ng] Error 2

The problem is that the 802.11 netlink interface changed and the driver was not updated

This patch solves the issue

Thanks a lot,

Signed-off-by Javier Martinez Canillas <[email protected]>
---
 drivers/staging/wlan-ng/cfg80211.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/wlan-ng/cfg80211.c +1 -1
index b0792f7..9803b28 100644
@@ -599,14 +599,14 @@ int prism2_leave_ibss(struct wiphy *wiphy, struct net_device *dev) {
 
 
 int prism2_set_tx_power(struct wiphy *wiphy,
-			enum tx_power_setting type, int dbm) {
+			enum nl80211_tx_power_setting type, int dbm) {
 	struct prism2_wiphy_private *priv = wiphy_priv(wiphy);

drivers/staging/wlan-ng/cfg80211.c int prism2_leave_ibss(struct wiphy *wiphy, struct net_device *dev) { · line 612

Quoted 10 lines
drivers/staging/wlan-ng/cfg80211.c +1 -1
 	wlandevice_t *wlandev = priv->wlandev;
 	u32 data;
 	int result;
 	int err = 0;
 
-	if (type = TX_POWER_AUTOMATIC)
+	if (type = NL80211_TX_POWER_AUTOMATIC)
 		data = 30;
 	else
 		data = dbm;

ACK

Signature · 2 lines
----------------------------------------------------------------
Karen & Karl Relton                [email protected]
#2 lore raw

Re: [PATCH] staging/wlan-ng: fix compile error updating to new

In reply to Javier Martinez Canillas
Quoted 18 lines · Javier Martinez Canillas

Hello,

A few days ago I send this patch and didn't get any feedback. So I'm resending it.

In linux-next I got a compile error in wlan-ng:

CC [M] drivers/staging/wlan-ng/p80211netdev.o
In file included from drivers/staging/wlan-ng/p80211netdev.c:91:
drivers/staging/wlan-ng/cfg80211.c:602: warning: ‘enum tx_power_setting’ declared inside parameter list drivers/staging/wlan-ng/cfg80211.c:602: warning: its scope is only this definition or declaration, which is probably not what you want drivers/staging/wlan-ng/cfg80211.c:602: error: parameter 2 (‘type’) has incomplete type drivers/staging/wlan-ng/cfg80211.c: In function ‘prism2_set_tx_power’:
drivers/staging/wlan-ng/cfg80211.c:609: error: ‘TX_POWER_AUTOMATIC’ undeclared (first use in this function) drivers/staging/wlan-ng/cfg80211.c:609: error: (Each undeclared identifier is reported only once drivers/staging/wlan-ng/cfg80211.c:609: error: for each function it appears in.)
make[1]: *** [drivers/staging/wlan-ng/p80211netdev.o] Error 1
make: *** [_module_drivers/staging/wlan-ng] Error 2

Quoted 1 line

The problem is that the 802.11 netlink interface changed and the driver was not updated

I don't see this error anymore in Linus's tree, is it still needed?

thanks,

greg k-h

author
#3 lore raw

Re: [PATCH] staging/wlan-ng: fix compile error updating to new

In reply to Javier Martinez Canillas
Quoted 5 lines
Quoted 2 lines

The problem is that the 802.11 netlink interface changed and the driver was not updated

I don't see this error anymore in Linus's tree, is it still needed?

No, the patch is not needed anymore.

Thanks a lot

Quoted 4 lines

thanks,

greg k-h

Best regards,

-----------------------------------------
Javier Martínez Canillas
+595 981 88 66 58
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html