linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Berg <johannes@sipsolutions.net>
To: John Linville <linville@tuxdriver.com>
Cc: "Luis R. Rodriguez" <mcgrof@gmail.com>,
	linux-wireless <linux-wireless@vger.kernel.org>
Subject: [PATCH] wireless: update regulatory sample code
Date: Wed, 22 Oct 2008 20:55:52 +0200	[thread overview]
Message-ID: <1224701752.30459.53.camel@johannes.berg> (raw)

Update the same code for the recent changes. I did this as a
separate patch to avoid removing a lot of sample code only
to add it back again in the next patch.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
---
 Documentation/networking/regulatory.txt |   19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

--- everything.orig/Documentation/networking/regulatory.txt	2008-10-22 20:51:50.000000000 +0200
+++ everything/Documentation/networking/regulatory.txt	2008-10-22 20:54:12.000000000 +0200
@@ -131,7 +131,7 @@ are expected to do this during initializ
 
 	r = zd_reg2alpha2(mac->regdomain, alpha2);
 	if (!r)
-		regulatory_hint(hw->wiphy, alpha2, NULL);
+		regulatory_hint(alpha2);
 
 Example code - drivers providing a built in regulatory domain:
 --------------------------------------------------------------
@@ -178,17 +178,14 @@ Then in some part of your code after you
 
 	rd = kzalloc(size_of_regd, GFP_KERNEL);
 	if (!rd)
-	return -ENOMEM;
+		return -ENOMEM;
 
 	memcpy(rd, &mydriver_jp_regdom, sizeof(struct ieee80211_regdomain));
 
-	for (i=0; i < num_rules; i++) {
-		memcpy(&rd->reg_rules[i], &mydriver_jp_regdom.reg_rules[i],
-			sizeof(struct ieee80211_reg_rule));
-	}
-	r = regulatory_hint(hw->wiphy, NULL, rd);
-	if (r) {
-		kfree(rd);
-		return r;
-	}
+	for (i=0; i < num_rules; i++)
+		memcpy(&rd->reg_rules[i],
+		       &mydriver_jp_regdom.reg_rules[i],
+		       sizeof(struct ieee80211_reg_rule));
 
+	regulatory_struct_hint(rd, BIT(IEEE80211_BAND_2GHZ) |
+				   BIT(IEEE80211_BAND_5GHZ));



             reply	other threads:[~2008-10-22 18:55 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-22 18:55 Johannes Berg [this message]
2008-10-22 12:35 ` [PATCH] wireless: update regulatory sample code Luis R. Rodriguez
2008-10-22 19:41   ` Johannes Berg
2008-10-22 14:40     ` Luis R. Rodriguez
2008-10-23  6:24       ` Johannes Berg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1224701752.30459.53.camel@johannes.berg \
    --to=johannes@sipsolutions.net \
    --cc=linux-wireless@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    --cc=mcgrof@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).