From: Johannes Berg <johannes@sipsolutions.net>
To: linux-wireless@vger.kernel.org
Cc: John Linville <linville@tuxdriver.com>, Jiri Benc <jbenc@suse.cz>
Subject: [PATCH 10/10] cfg/nl80211: remove legacy network id
Date: Thu, 15 Feb 2007 15:42:51 +0100 [thread overview]
Message-ID: <20070215144300.830181000@sipsolutions.net> (raw)
In-Reply-To: 20070215144241.847938000@sipsolutions.net
This patch removes the legacy network ID.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
---
include/linux/nl80211.h | 4 ----
include/net/cfg80211.h | 10 ++++------
net/wireless/nl80211.c | 10 ----------
3 files changed, 4 insertions(+), 20 deletions(-)
--- wireless-dev.orig/include/linux/nl80211.h 2007-02-15 12:28:37.497940064 +0100
+++ wireless-dev/include/linux/nl80211.h 2007-02-15 12:28:42.007940064 +0100
@@ -161,10 +161,6 @@ enum {
/* wiphy list */
NL80211_ATTR_WIPHY_LIST,
- /* attributes used for configuration */
- /* network ID (pre 802.11 HW) */
- NL80211_ATTR_NETWORK_ID,
-
/* channel, 1-14 are B/G */
NL80211_ATTR_CHANNEL,
--- wireless-dev.orig/include/net/cfg80211.h 2007-02-15 12:28:41.297940064 +0100
+++ wireless-dev/include/net/cfg80211.h 2007-02-15 12:28:42.007940064 +0100
@@ -23,7 +23,6 @@ struct cfg80211_config {
s8 ssid_len;
u8 ssid[SSID_MAX_LEN];
- u16 network_id;
s32 rx_sensitivity;
u32 transmit_power;
u32 fragmentation_threshold;
@@ -31,11 +30,10 @@ struct cfg80211_config {
};
#define CFG80211_CFG_VALID_SSID (1<<0)
-#define CFG80211_CFG_VALID_NWID (1<<1)
-#define CFG80211_CFG_VALID_RX_SENSITIVITY (1<<2)
-#define CFG80211_CFG_VALID_TRANSMIT_POWER (1<<3)
-#define CFG80211_CFG_VALID_FRAG_THRESHOLD (1<<4)
-#define CFG80211_CFG_VALID_CHANNEL (1<<5)
+#define CFG80211_CFG_VALID_RX_SENSITIVITY (1<<1)
+#define CFG80211_CFG_VALID_TRANSMIT_POWER (1<<2)
+#define CFG80211_CFG_VALID_FRAG_THRESHOLD (1<<3)
+#define CFG80211_CFG_VALID_CHANNEL (1<<4)
struct scan_channel {
u32 channel;
--- wireless-dev.orig/net/wireless/nl80211.c 2007-02-15 12:28:41.307940064 +0100
+++ wireless-dev/net/wireless/nl80211.c 2007-02-15 12:28:42.007940064 +0100
@@ -75,7 +75,6 @@ static struct nla_policy nl80211_policy[
.len = NL80211_MAX_FRAME_LEN },
[NL80211_ATTR_IFNAME] = { .type = NLA_NUL_STRING, .len = IFNAMSIZ-1 },
[NL80211_ATTR_IFTYPE] = { .type = NLA_U32 },
- [NL80211_ATTR_NETWORK_ID] = { .type = NLA_U16 },
[NL80211_ATTR_CHANNEL] = { .type = NLA_U32 },
[NL80211_ATTR_RX_SENSITIVITY] = { .type = NLA_U32 },
[NL80211_ATTR_BSSID] = { .len = ETH_ALEN },
@@ -393,12 +392,6 @@ static int nl80211_configure(struct sk_b
memcpy(config.ssid, nla_data(attr), config.ssid_len);
}
- attr = info->attrs[NL80211_ATTR_NETWORK_ID];
- if (attr) {
- config.valid |= CFG80211_CFG_VALID_NWID;
- config.network_id = nla_get_u16(attr);
- }
-
attr = info->attrs[NL80211_ATTR_RX_SENSITIVITY];
if (attr) {
config.valid |= CFG80211_CFG_VALID_RX_SENSITIVITY;
@@ -465,9 +458,6 @@ static int nl80211_get_config(struct sk_
if (config.ssid)
NLA_PUT_STRING(msg, NL80211_ATTR_SSID, config.ssid);
- if (config.valid & CFG80211_CFG_VALID_NWID)
- NLA_PUT_U16(msg, NL80211_ATTR_NETWORK_ID, config.network_id);
-
if (config.valid & CFG80211_CFG_VALID_RX_SENSITIVITY)
NLA_PUT_U32(msg, NL80211_ATTR_RX_SENSITIVITY, (u32)config.rx_sensitivity);
--
next prev parent reply other threads:[~2007-02-15 15:00 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-15 14:42 [PATCH 00/10] cfg80211 updates Johannes Berg
2007-02-15 14:42 ` [PATCH 01/10] remove cfg80211/wext-nl compatibility Johannes Berg
2007-02-15 14:42 ` [PATCH 02/10] update cfg80211/wext and wext code Johannes Berg
2007-02-15 14:42 ` [PATCH 03/10] introduce wiphy concept Johannes Berg
2007-02-19 20:37 ` Jiri Benc
2007-02-19 20:55 ` Johannes Berg
2007-02-15 14:42 ` [PATCH 04/10] cfg/nl80211: make association explicit Johannes Berg
2007-02-15 14:42 ` [PATCH 05/10] wext: clean up Johannes Berg
2007-02-15 14:42 ` [PATCH 06/10] d80211: update for wiphy api Johannes Berg
2007-02-15 16:16 ` Johannes Berg
2007-02-19 20:49 ` Jiri Benc
2007-02-19 21:03 ` Johannes Berg
2007-02-15 14:42 ` [PATCH 07/10] bcm43xx-d80211: " Johannes Berg
2007-02-15 15:09 ` Michael Buesch
2007-02-15 15:18 ` Johannes Berg
2007-02-15 14:42 ` [PATCH 08/10] zd1211rw-d80211: " Johannes Berg
2007-02-15 14:42 ` [PATCH 09/10] cfg80211: pending config Johannes Berg
2007-02-16 19:10 ` Dan Williams
2007-02-16 20:22 ` Johannes Berg
2007-02-16 20:49 ` Michael Wu
2007-02-15 14:42 ` Johannes Berg [this message]
2007-02-16 19:12 ` [PATCH 10/10] cfg/nl80211: remove legacy network id Dan Williams
2007-02-16 20:16 ` Johannes Berg
2007-02-15 16:02 ` [PATCH 00/10] cfg80211 updates 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=20070215144300.830181000@sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=jbenc@suse.cz \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.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).