* [PATCH] staging: wlan-ng: Update get_tx_power()/set_tx_power() signature
@ 2012-12-16 12:28 Geert Uytterhoeven
2013-01-07 23:02 ` Greg Kroah-Hartman
0 siblings, 1 reply; 2+ messages in thread
From: Geert Uytterhoeven @ 2012-12-16 12:28 UTC (permalink / raw)
To: Greg Kroah-Hartman, Johannes Berg; +Cc: devel, linux-kernel, Geert Uytterhoeven
In file included from drivers/staging/wlan-ng/p80211netdev.c:92:
drivers/staging/wlan-ng/cfg80211.c:735: warning: initialization from incompatible pointer type
drivers/staging/wlan-ng/cfg80211.c:736: warning: initialization from incompatible pointer type
Cfr. commit c8442118ad9cd05cfe3b993f058e70ab25b1009a ("cfg80211: allow per
interface TX power setting"), which added a new parameter.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
drivers/staging/wlan-ng/cfg80211.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wlan-ng/cfg80211.c b/drivers/staging/wlan-ng/cfg80211.c
index 18c06a5..1d31eab 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -638,8 +638,8 @@ int prism2_leave_ibss(struct wiphy *wiphy, struct net_device *dev)
}
-int prism2_set_tx_power(struct wiphy *wiphy, enum nl80211_tx_power_setting type,
- int mbm)
+int prism2_set_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev,
+ enum nl80211_tx_power_setting type, int mbm)
{
struct prism2_wiphy_private *priv = wiphy_priv(wiphy);
wlandevice_t *wlandev = priv->wlandev;
@@ -665,7 +665,8 @@ exit:
return err;
}
-int prism2_get_tx_power(struct wiphy *wiphy, int *dbm)
+int prism2_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev,
+ int *dbm)
{
struct prism2_wiphy_private *priv = wiphy_priv(wiphy);
wlandevice_t *wlandev = priv->wlandev;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] staging: wlan-ng: Update get_tx_power()/set_tx_power() signature
2012-12-16 12:28 [PATCH] staging: wlan-ng: Update get_tx_power()/set_tx_power() signature Geert Uytterhoeven
@ 2013-01-07 23:02 ` Greg Kroah-Hartman
0 siblings, 0 replies; 2+ messages in thread
From: Greg Kroah-Hartman @ 2013-01-07 23:02 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Johannes Berg, devel, linux-kernel
On Sun, Dec 16, 2012 at 01:28:42PM +0100, Geert Uytterhoeven wrote:
> In file included from drivers/staging/wlan-ng/p80211netdev.c:92:
> drivers/staging/wlan-ng/cfg80211.c:735: warning: initialization from incompatible pointer type
> drivers/staging/wlan-ng/cfg80211.c:736: warning: initialization from incompatible pointer type
>
> Cfr. commit c8442118ad9cd05cfe3b993f058e70ab25b1009a ("cfg80211: allow per
> interface TX power setting"), which added a new parameter.
>
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> ---
> drivers/staging/wlan-ng/cfg80211.c | 7 ++++---
> 1 files changed, 4 insertions(+), 3 deletions(-)
Sorry, someone else already sent this in, and it's now in my tree.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-01-07 23:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-16 12:28 [PATCH] staging: wlan-ng: Update get_tx_power()/set_tx_power() signature Geert Uytterhoeven
2013-01-07 23:02 ` Greg Kroah-Hartman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.