linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] cfg80211: add a callback for querying the operating frequency and export it through nl80211
@ 2010-01-17 19:54 Felix Fietkau
  2010-01-17 19:55 ` [PATCH 2/2] mac80211: implement the callback for querying the operating frequency Felix Fietkau
  2010-01-17 19:57 ` [PATCH 1/2] cfg80211: add a callback for querying the operating frequency and export it through nl80211 Johannes Berg
  0 siblings, 2 replies; 14+ messages in thread
From: Felix Fietkau @ 2010-01-17 19:54 UTC (permalink / raw)
  To: linux-wireless; +Cc: Johannes Berg, John W. Linville

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -954,6 +954,8 @@ struct cfg80211_pmksa {
  *
  * @set_txq_params: Set TX queue parameters
  *
+ * @get_channel: Get operating channel
+ *
  * @set_channel: Set channel
  *
  * @scan: Request to do a scan. If returning zero, the scan request is given
@@ -1079,6 +1081,10 @@ struct cfg80211_ops {
 	int	(*set_txq_params)(struct wiphy *wiphy,
 				  struct ieee80211_txq_params *params);
 
+	int	(*get_channel)(struct wiphy *wiphy,
+			       struct ieee80211_channel **chan,
+			       enum nl80211_channel_type *channel_type);
+
 	int	(*set_channel)(struct wiphy *wiphy,
 			       struct ieee80211_channel *chan,
 			       enum nl80211_channel_type channel_type);
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -427,7 +427,8 @@ static int nl80211_send_wiphy(struct sk_
 	struct nlattr *nl_modes;
 	struct nlattr *nl_cmds;
 	enum ieee80211_band band;
-	struct ieee80211_channel *chan;
+	struct ieee80211_channel *chan = NULL;
+	enum nl80211_channel_type chan_type;
 	struct ieee80211_rate *rate;
 	int i;
 	u16 ifmodes = dev->wiphy.interface_modes;
@@ -465,6 +466,12 @@ static int nl80211_send_wiphy(struct sk_
 	NLA_PUT_U8(msg, NL80211_ATTR_MAX_NUM_PMKIDS,
 		   dev->wiphy.max_num_pmkids);
 
+	if (dev->ops->get_channel &&
+	    dev->ops->get_channel(&dev->wiphy, &chan, &chan_type) == 0) {
+		NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ, chan->center_freq);
+		NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE, chan_type);
+	}
+
 	nl_modes = nla_nest_start(msg, NL80211_ATTR_SUPPORTED_IFTYPES);
 	if (!nl_modes)
 		goto nla_put_failure;

^ permalink raw reply	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2010-01-20  9:49 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-17 19:54 [PATCH 1/2] cfg80211: add a callback for querying the operating frequency and export it through nl80211 Felix Fietkau
2010-01-17 19:55 ` [PATCH 2/2] mac80211: implement the callback for querying the operating frequency Felix Fietkau
2010-01-17 19:57 ` [PATCH 1/2] cfg80211: add a callback for querying the operating frequency and export it through nl80211 Johannes Berg
2010-01-17 20:00   ` Johannes Berg
2010-01-17 20:12     ` Felix Fietkau
2010-01-17 20:14       ` Johannes Berg
2010-01-17 20:23         ` Felix Fietkau
2010-01-17 20:48           ` Johannes Berg
2010-01-17 21:01             ` Felix Fietkau
2010-01-17 21:03               ` Felix Fietkau
2010-01-17 21:05               ` Johannes Berg
2010-01-19 17:39                 ` Luis R. Rodriguez
2010-01-20  7:32                 ` Holger Schurig
2010-01-20  9:49                   ` Johannes Berg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).