Skip to contentSkip to conversation

more nl80211 stuff

RFC In review Johannes Berg 5 participants 14 messages Sep 14, 2006 – Oct 6, 2006

Subsystems (3)
lore
Share & tools
lore

Johannes Berg

author maintainer
#0 lore raw

Hi,

Last night I thought a bit more about configuration handling with cfg80211/nl80211 and have refined the original framework to be more split into cfg80211 and nl80211 stuff.

As a followup, I'll post three patches, the first two are essentially the original ones respun, while the third one represents my current thoughts (a bit less I guess) on actual configuration and WE compatibility.

johannes

author maintainer
#1 lore raw

RFC 1/3 cfg80211/nl80211 core

This patch adds cfg80211/nl80211, a netlink based configuration system for wireless hardware.

It currently features a few helper commands and commands to add and remove virtual interfaces and to inject packets. Support for nl80211 in d80211 is in a follow-up patch.

There should be support for notifications, but we need to figure out if we remove the sysfs based add/remove virtual interface thing completely or allow the driver to create a notification through some new API here.

Modulo file renames and a bit of split ups, it is identical to previous versions.

It requires the patches in
http://marc.theaimsgroup.com/?l=linux-netdev&m=115625436628696&w=2
and
http://marc.theaimsgroup.com/?l=linux-netdev&m=115625168405439&w=2

(the latter doesn't apply cleanly against wireless-dev, but you can safely ignore the pieces that don't, at least for wireless testing :) )

It also requires the NLA_PUT_FLAG patch I did:
http://marc.theaimsgroup.com/?l=linux-netdev&m=115650333420169&w=2

net/Kconfig +3 -0
@@ -250,6 +250,9 @@ source "net/ieee80211/Kconfig"
 config WIRELESS_EXT
 	bool
 
+config CFG80211
+	tristate
+
 endif   # if NET
 endmenu # Networking
 
net/Makefile +1 -0
@@ -44,6 +44,7 @@ obj-$(CONFIG_ECONET)		+= econet/
 obj-$(CONFIG_VLAN_8021Q)	+= 8021q/
 obj-$(CONFIG_IP_DCCP)		+= dccp/
 obj-$(CONFIG_IP_SCTP)		+= sctp/
+obj-$(CONFIG_CFG80211)		+= wireless/
 obj-$(CONFIG_D80211)		+= d80211/
 obj-$(CONFIG_IEEE80211)		+= ieee80211/
 obj-$(CONFIG_TIPC)		+= tipc/
net/wireless/Makefile new file +4 -0
@@ -0,0 +1,4 @@
+obj-$(CONFIG_CFG80211) += cfg80211.o
+
+cfg80211-objs := \
+	core.o nl80211.o
net/wireless/nl80211.c new file +395 -0

395 lines not on this page · raw message

include/linux/Kbuild +1 -1
@@ -28,7 +28,7 @@ header-y += affs_fs.h affs_hardblocks.h 
 	sound.h stddef.h synclink.h telephony.h termios.h ticable.h	\
 	times.h tiocl.h tipc.h toshiba.h ultrasound.h un.h utime.h	\
 	utsname.h video_decoder.h video_encoder.h videotext.h vt.h	\
-	wavefront.h wireless.h xattr.h x25.h zorro_ids.h
+	wavefront.h wireless.h xattr.h x25.h zorro_ids.h nl80211.h
 
 unifdef-y += acct.h adb.h adfs_fs.h agpgart.h apm_bios.h atalk.h	\
 	atmarp.h atmdev.h atm.h atm_tcp.h audit.h auto_fs.h binfmts.h	\
include/linux/nl80211.h new file +137 -0

137 lines not on this page · raw message

include/net/cfg80211.h new file +84 -0

84 lines not on this page · raw message

net/wireless/core.c new file +233 -0

233 lines not on this page · raw message

net/wireless/core.h new file +57 -0

57 lines not on this page · raw message

net/wireless/nl80211.h new file +7 -0
@@ -0,0 +1,7 @@
+#ifndef __NET_WIRELESS_NL80211_H
+#define __NET_WIRELESS_NL80211_H
+
+extern int nl80211_init(void);
+extern void nl80211_exit(void);
+
+#endif /* __NET_WIRELESS_NL80211_H */
#2 lore raw

Re: [RFC 1/3] cfg80211/nl80211 core

Quoted 4 lines · Johannes Berg

There should be support for notifications, but we need to figure out if we remove the sysfs based add/remove virtual interface thing completely or allow the driver to create a notification through some new API here.

Feel free to remove it if it makes your work easier.

Jiri

Signature · 2 lines
Jiri Benc
SUSE Labs
author maintainer
#3 lore raw

Re: [RFC 1/3] cfg80211/nl80211 core

Quoted 7 lines · Jiri Benc
Quoted 4 lines · Johannes Berg

There should be support for notifications, but we need to figure out if we remove the sysfs based add/remove virtual interface thing completely or allow the driver to create a notification through some new API here.

Feel free to remove it if it makes your work easier.

It definitely would.

johannes

author maintainer
#4 lore raw

Re: [RFC 1/3] cfg80211/nl80211 core

In reply to Johannes Berg
Quoted 8 lines · Johannes Berg
net/wireless/core.c new file +8 -0
+struct cfg80211_registered_driver *
+cfg80211_get_drv_from_ifindex(int ifindex)
+{
+	struct cfg80211_registered_driver *drv;
+	struct net_device *dev;
+
+	mutex_lock(&cfg80211_drv_mutex);
+	dev = dev_get_by_index(ifindex);

net/wireless/core.c line 137

Quoted 10 lines
net/wireless/core.c new file +10 -0
+	if (!dev)
+		return ERR_PTR(-ENODEV);
+	drv = cfg80211_drv_by_priv(dev->ieee80211_ptr);
+	if (drv)
+		mutex_lock(&drv->mtx);
+	dev_put(dev);
+	if (drv)
+		return drv;
+	return ERR_PTR(-ENODEV);
+}

So... nobody spotted the "obvious" [1] locking problem here ;) fixed, will update the patches soon and upload somewhere, netdev doesn't like them and drops my mail (even 0/3 which wasn't that big).

johannes

[1] hint: drv->mtx is supposed to be left locked at the end, but cfg80211_drv_mutex isn't :) I found out the hard way when testing my WE backward compat code

author maintainer
#5 lore raw

RFC 2/3 make d80211 use cfg80211

In reply to Johannes Berg

This patch makes d80211 partially configurable using the infrastructure that nl80211 provides. So far, it allows packet injection and adding/removing virtual interfaces.

Also identical to previous patches except for the file and Kconfig renames that nl80211/cfg80211 went through.

net/d80211/Kconfig +1 -0
@@ -3,6 +3,7 @@ config D80211
 	select CRYPTO
 	select CRYPTO_ARC4
 	select CRYPTO_AES
+	select CFG80211
 	---help---
 	This option enables the hardware independent IEEE 802.11
 	networking stack.
net/d80211/Makefile +1 -0
@@ -8,6 +8,7 @@ obj-$(CONFIG_D80211) += 80211.o rate_con
 	sta_info.o \
 	wep.o \
 	wpa.o \
+	ieee80211_cfg.o \
 	ieee80211_scan.o \
 	ieee80211_sta.o \
 	ieee80211_dev.o \
net/d80211/ieee80211.c +64 -17

186 lines not on this page · raw message

net/d80211/ieee80211_cfg.c new file +144 -0

144 lines not on this page · raw message

net/d80211/ieee80211_cfg.h new file +9 -0
@@ -0,0 +1,9 @@
+#ifndef __IEEE80211_CFG_H
+#define __IEEE80211_CFG_H
+
+#include "ieee80211_i.h"
+
+extern int ieee80211_cfg_init(struct ieee80211_local *local);
+extern void ieee80211_cfg_exit(struct ieee80211_local *local);
+
+#endif /* __IEEE80211_CFG_H */
net/d80211/ieee80211_i.h +7 -6
@@ -153,12 +153,13 @@ struct ieee80211_txrx_data {
 struct ieee80211_tx_packet_data {
 	int ifindex;
 	unsigned long jiffies;
-	unsigned int req_tx_status:1;
-	unsigned int do_not_encrypt:1;
-	unsigned int pkt_probe_resp:1;
-	unsigned int requeue:1;
-	unsigned int queue:4;
-	unsigned int mgmt_iface:1;
+/* we simply re-use NL80211_FLAG_* here */
+	unsigned int flags;
+	unsigned int queue;
+#define TX_FLAG_INJECTED	(1<<0)
+#define TX_FLAG_REQUEUE		(1<<1)
+#define TX_FLAG_PROBERESP	(1<<2)
+	unsigned int internal_flags;
 };
 
 struct ieee80211_tx_stored_packet {
net/d80211/ieee80211_sta.c +6 -3
@@ -21,6 +21,7 @@
 #include <linux/if_arp.h>
 #include <linux/wireless.h>
 #include <linux/random.h>
+#include <linux/nl80211.h>
 #include <net/iw_handler.h>
 #include <asm/types.h>
 #include <asm/delay.h>
@@ -396,10 +397,12 @@ static void ieee80211_sta_tx(struct net_
 	pkt_data = (struct ieee80211_tx_packet_data *) skb->cb;
 	memset(pkt_data, 0, sizeof(struct ieee80211_tx_packet_data));
 	pkt_data->ifindex = sdata->dev->ifindex;
-	pkt_data->mgmt_iface = (sdata->type == IEEE80211_IF_TYPE_MGMT);
-	pkt_data->do_not_encrypt = !encrypt;
+	if (sdata->type == IEEE80211_IF_TYPE_MGMT)
+		pkt_data->internal_flags |= TX_FLAG_INJECTED;
+	if (encrypt)
+		pkt_data->flags |= NL80211_FLAG_ENCRYPT;
 	if (probe_resp)
-		pkt_data->pkt_probe_resp = 1;
+		pkt_data->internal_flags |= TX_FLAG_PROBERESP;
 
 	dev_queue_xmit(skb);
 }
net/d80211/wme.c +4 -2
@@ -11,6 +11,7 @@
 #include <linux/module.h>
 #include <linux/if_arp.h>
 #include <linux/types.h>
+#include <linux/nl80211.h>
 #include <net/ip.h>
 #include <net/pkt_sched.h>
 
@@ -190,7 +191,8 @@ static inline int classify80211(struct s
 		return IEEE80211_TX_QUEUE_DATA0;
 	}
 
-	if (unlikely(pkt_data->mgmt_iface)) {
+	/* FIXME: this needs to be revisited for more generic injection */
+	if (unlikely(pkt_data->internal_flags & TX_FLAG_INJECTED)) {
 		/* Data frames from hostapd (mainly, EAPOL) use AC_VO
 		* and they will include QoS control fields if
 		* the target STA is using WME. */
@@ -236,7 +238,7 @@ static int wme_qdiscop_enqueue(struct sk
 	struct Qdisc *qdisc;
 	int err, queue;
 
-	if (pkt_data->requeue) {
+	if (pkt_data->internal_flags & TX_FLAG_REQUEUE) {
 		skb_queue_tail(&q->requeued[pkt_data->queue], skb);
 		return 0;
 	}
#6 lore raw

RE: [RFC 2/3] make d80211 use cfg80211

Hi Johannes,

Does the packet injection allow hostapd to use nl80211 instead of the wlan0ap interface to send management frames? Important features for this include requesting a transmit status - i.e. the ability for hostapd/wpa_supplicant to know if the frame got acked or not.

Simon

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Johannes Berg
Sent: Thursday, September 14, 2006 3:50 AM
To: [email protected]
Cc: John W. Linville; Michael Buesch; Jean Tourrilhes; Jiri Benc; James P. Ketrenos; Mohamed Abbas; Ulrich Kunitz; Daniel Drake
Subject: [RFC 2/3] make d80211 use cfg80211

This patch makes d80211 partially configurable using the infrastructure that nl80211 provides. So far, it allows packet injection and adding/removing virtual interfaces.

Also identical to previous patches except for the file and Kconfig renames that nl80211/cfg80211 went through.

--- wireless-dev.orig/net/d80211/Kconfig 2006-09-13
22:06:09.209647141 +0200
+++ wireless-dev/net/d80211/Kconfig 2006-09-13 22:06:12.559647141
+0200
@@ -3,6 +3,7 @@ config D80211
select CRYPTO
select CRYPTO_ARC4
select CRYPTO_AES
+ select CFG80211
---help---
This option enables the hardware independent IEEE 802.11 networking stack.
--- wireless-dev.orig/net/d80211/Makefile 2006-09-13
22:06:09.219647141 +0200
+++ wireless-dev/net/d80211/Makefile 2006-09-13 22:06:12.559647141
+0200
@@ -8,6 +8,7 @@ obj-$(CONFIG_D80211) += 80211.o rate_con
sta_info.o \
wep.o \
wpa.o \
+ ieee80211_cfg.o \
ieee80211_scan.o \
ieee80211_sta.o \
ieee80211_dev.o \
--- wireless-dev.orig/net/d80211/ieee80211.c 2006-09-13
22:06:09.209647141 +0200
+++ wireless-dev/net/d80211/ieee80211.c 2006-09-13 22:06:12.569647141
+0200
@@ -20,6 +20,7 @@
#include <net/iw_handler.h>
#include <linux/compiler.h>
#include <linux/bitmap.h>
+#include <linux/nl80211.h>

#include <net/d80211.h>
#include <net/d80211_common.h>
@@ -32,6 +33,7 @@
#include "wme.h"
#include "aes_ccm.h"
#include "ieee80211_led.h"
+#include "ieee80211_cfg.h"

/* See IEEE 802.1H for LLC/SNAP encapsulation/decapsulation */ /* Ethernet-II snap header (RFC1042 for most EtherTypes) */ @@ -354,6
+356,16 @@ ieee80211_tx_h_rate_ctrl(struct ieee8021 {
struct rate_control_extra extra;

+ /* FIXME
+ if (tx->dev == tx->local->mdev &&
+ (inject rate set)) {
+ a
+ tx->u.tx.rate = ...
+ etc etc
+ return TXRX_CONTINUE;
+ }
+ */
+
memset(&extra, 0, sizeof(extra));
extra.mgmt_data = tx->sdata &&
tx->sdata->type == IEEE80211_IF_TYPE_MGMT; @@ -759,6
+771,13 @@ ieee80211_tx_h_misc(struct ieee80211_txr
u16 dur;
struct ieee80211_tx_control *control = tx->u.tx.control;

+ /* FIXME
+ if (tx->dev == tx->local->mdev) {
+ set up retry limit, ...
+ based on injection parameters
+ }
+ */
+
if (!is_multicast_ether_addr(hdr->addr1)) {
if (tx->skb->len + FCS_LEN > tx->local->rts_threshold &&
tx->local->rts_threshold <
IEEE80211_MAX_RTS_THRESHOLD) { @@ -884,6 +903,9 @@ ieee80211_tx_h_check_assoc(struct ieee80 #endif /* CONFIG_D80211_VERBOSE_DEBUG */
u32 sta_flags;

+ if (unlikely(tx->dev == tx->local->mdev))
+ return TXRX_CONTINUE;
+
if (unlikely(tx->local->sta_scanning != 0) &&
((tx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_MGMT ||
(tx->fc & IEEE80211_FCTL_STYPE) !=
IEEE80211_STYPE_PROBE_REQ)) @@ -987,6 +1009,12 @@ static void purge_old_ps_buffers(struct static inline ieee80211_txrx_result ieee80211_tx_h_multicast_ps_buf(struct ieee80211_txrx_data *tx) {
+ /* FIXME
+ if (unlikely(tx->dev == tx->local->mdev &&
+ (inject flags) & NL80211_FLAG_NOBUFFER))
+ return TXRX_CONTINUE;
+ */
+
/* broadcast/multicast frame */
/* If any of the associated stations is in power save mode,
* the frame is buffered to be sent after DTIM beacon frame */
@@ -1414,11 +1442,12 @@ static int ieee80211_master_start_xmit(s

control.ifindex = odev->ifindex;
control.type = osdata->type;
- control.req_tx_status = pkt_data->req_tx_status;
- control.do_not_encrypt = pkt_data->do_not_encrypt;
+ control.req_tx_status = !!(pkt_data->flags &
NL80211_FLAG_TXSTATUS);
+ control.do_not_encrypt = !(pkt_data->flags &
NL80211_FLAG_ENCRYPT);
control.pkt_type =
- pkt_data->pkt_probe_resp ? PKT_PROBE_RESP : PKT_NORMAL;
- control.requeue = pkt_data->requeue;
+ (pkt_data->internal_flags & TX_FLAG_PROBERESP) ?
+ PKT_PROBE_RESP : PKT_NORMAL;
+ control.requeue = !!(pkt_data->internal_flags &
TX_FLAG_REQUEUE);
control.queue = pkt_data->queue;

ret = ieee80211_tx(odev, skb, &control, @@ -1594,8 +1623,10 @@
static int ieee80211_subif_start_xmit(st
pkt_data = (struct ieee80211_tx_packet_data *)skb->cb; memset(pkt_data, 0, sizeof(struct ieee80211_tx_packet_data)); pkt_data->ifindex = sdata->dev->ifindex;
- pkt_data->mgmt_iface = (sdata->type == IEEE80211_IF_TYPE_MGMT);
- pkt_data->do_not_encrypt = no_encrypt;
+ if (sdata->type == IEEE80211_IF_TYPE_MGMT)
+ pkt_data->internal_flags |= TX_FLAG_INJECTED;
+ if (!no_encrypt)
+ pkt_data->flags |= NL80211_FLAG_ENCRYPT;

skb->dev = sdata->master; sdata->stats.tx_packets++;
@@ -1646,11 +1677,12 @@ ieee80211_mgmt_start_xmit(struct sk_buff
pkt_data = (struct ieee80211_tx_packet_data *) skb->cb;

 	memset(pkt_data, 0, sizeof(struct ieee80211_tx_packet_data));
         pkt_data->ifindex = sdata->dev->ifindex;

- pkt_data->mgmt_iface = (sdata->type == IEEE80211_IF_TYPE_MGMT);
+ if (sdata->type == IEEE80211_IF_TYPE_MGMT)
+ pkt_data->internal_flags |= TX_FLAG_INJECTED;

if ((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT &&
(fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_PROBE_RESP)
- pkt_data->pkt_probe_resp = 1;
+ pkt_data->internal_flags |= TX_FLAG_PROBERESP;

skb->priority = 20; /* use hardcoded priority for mgmt TX queue
*/
skb->dev = sdata->master;
@@ -1660,12 +1692,13 @@ ieee80211_mgmt_start_xmit(struct sk_buff
* to request TX callback for hostapd. BIT(1) is checked. */
if ((fc & BIT(1)) == BIT(1)) {
- pkt_data->req_tx_status = 1;
+ pkt_data->flags |= NL80211_FLAG_TXSTATUS;
fc &= ~BIT(1);
hdr->frame_control = cpu_to_le16(fc);
}

- pkt_data->do_not_encrypt = !(fc & IEEE80211_FCTL_PROTECTED);
+ if (fc & IEEE80211_FCTL_PROTECTED)
+ pkt_data->flags |= NL80211_FLAG_ENCRYPT;

 	sdata->stats.tx_packets++;
         sdata->stats.tx_bytes += skb->len; @@ -2715,7 +2748,7 @@ static

int ap_sta_ps_end(struct net_devi
while ((skb = skb_dequeue(&sta->tx_filtered)) != NULL) {
pkt_data = (struct ieee80211_tx_packet_data *) skb->cb; sent++;
- pkt_data->requeue = 1;
+ pkt_data->internal_flags |= TX_FLAG_REQUEUE;
dev_queue_xmit(skb);
}
while ((skb = skb_dequeue(&sta->ps_tx_buf)) != NULL) { @@
-2727,7 +2760,7 @@ static int ap_sta_ps_end(struct net_devi
"since STA not sleeping anymore\n", dev->name, MAC_ARG(sta->addr), sta->aid); #endif /*
CONFIG_D80211_VERBOSE_PS_DEBUG */
- pkt_data->requeue = 1;
+ pkt_data->internal_flags |= TX_FLAG_REQUEUE;
dev_queue_xmit(skb);
}

@@ -3958,12 +3991,19 @@ static void ieee80211_remove_tx_extra(st
struct ieee80211_tx_packet_data *pkt_data;

pkt_data = (struct ieee80211_tx_packet_data *)skb->cb;
+ pkt_data->flags = 0;
+ pkt_data->internal_flags = 0;
pkt_data->ifindex = control->ifindex;
- pkt_data->mgmt_iface = (control->type ==
IEEE80211_IF_TYPE_MGMT);
- pkt_data->req_tx_status = control->req_tx_status;
- pkt_data->do_not_encrypt = control->do_not_encrypt;
- pkt_data->pkt_probe_resp = (control->pkt_type ==
PKT_PROBE_RESP);
- pkt_data->requeue = control->requeue;
+ if (control->type == IEEE80211_IF_TYPE_MGMT)
+ pkt_data->internal_flags |= TX_FLAG_INJECTED;
+ if (control->req_tx_status)
+ pkt_data->flags |= NL80211_FLAG_TXSTATUS;
+ if (!control->do_not_encrypt)
+ pkt_data->flags |= NL80211_FLAG_ENCRYPT;
+ if (control->pkt_type == PKT_PROBE_RESP)
+ pkt_data->internal_flags |= TX_FLAG_PROBERESP;
+ if (control->requeue)
+ pkt_data->internal_flags |= TX_FLAG_REQUEUE;
pkt_data->queue = control->queue;

hdrlen = ieee80211_get_hdrlen_from_skb(skb);
@@ -4422,6 +4462,9 @@ int ieee80211_register_hw(struct net_dev
if (result < 0)
return -1;

+ if (ieee80211_cfg_init(local) < 0)
+ goto fail_nl80211;
+
local->class_dev.dev = dev->class_dev.dev; result = ieee80211_dev_sysfs_add(local);
if (result < 0)
@@ -4508,6 +4551,8 @@ fail_dev:
fail_sta_info:
ieee80211_dev_sysfs_del(local);
fail_sysfs:
+ ieee80211_cfg_exit(local);
+fail_nl80211:
ieee80211_dev_free_index(local);
return result;
}
@@ -4589,6 +4634,8 @@ void ieee80211_unregister_hw(struct net_
&local->class_dev.kobj);
ieee80211_dev_sysfs_del(local);

+ ieee80211_cfg_exit(local);
+
for (i = 0; i < NUM_IEEE80211_MODES; i++) {
kfree(local->supp_rates[i]); kfree(local->basic_rates[i]);
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ wireless-dev/net/d80211/ieee80211_cfg.c 2006-09-13
22:06:12.569647141 +0200
@@ -0,0 +1,144 @@
+/*
+ * cfg80211-based configuration for d80211
+ *
+ * Copyright 2006 Johannes Berg <[email protected]> */ +#include <net/cfg80211.h> #include <linux/netdevice.h> #include +<linux/rtnetlink.h> #include "ieee80211_cfg.h"
+#include "ieee80211_i.h"
+
+/* copied from ieee80211_sysfs.c for now ... */ static inline int +rtnl_lock_local(struct ieee80211_local *local) {
+ rtnl_lock();
+ if (unlikely(local->reg_state != IEEE80211_DEV_REGISTERED)) {
+ rtnl_unlock();
+ return -ENODEV;
+ }
+ return 0;
+}
+
+static int ieee80211_interfaces(void *priv, void *data,
+ int (*one)(void *data, int ifindex)) {
+ struct ieee80211_local *local = priv;
+ struct ieee80211_sub_if_data *sdata;
+ int err = 0;
+
+ spin_lock_bh(&local->sub_if_lock);
+ list_for_each_entry(sdata, &local->sub_if_list, list) {
+ err = one(data, sdata->dev->ifindex);
+ if (err)
+ break;
+ }
+ spin_unlock_bh(&local->sub_if_lock);
+ return err;
+}
+
+static int ieee80211_inject(void *priv, void *frame, int framelen, u32 flags,
+ int queue)
+{
+ struct ieee80211_local *local = priv;
+ struct ieee80211_tx_packet_data *pkt_data;
+ struct sk_buff *skb;
+
+ skb = alloc_skb(framelen, GFP_KERNEL);
+ if (!skb)
+ return -ENOMEM;
+
+ memcpy(skb_put(skb, framelen), frame, framelen);
+
+ pkt_data = (struct ieee80211_tx_packet_data *) skb->cb;
+ pkt_data->ifindex = local->mdev->ifindex;
+ pkt_data->internal_flags = TX_FLAG_INJECTED;
+ pkt_data->flags = flags;
+ /* FIXME: never used, I think? Or could be invalid? */
+ pkt_data->queue = queue;
+
+ /* FIXME */
+ skb->priority = 20; /* use hardcoded priority for mgmt TX queue
*/
+
+ skb->dev = local->mdev;
+ dev_queue_xmit(skb);
+
+ return 0;
+}
+
+static int ieee80211_add_virtual_intf(void *priv, char *name,
+ unsigned int type)
+{
+ struct ieee80211_local *local = priv;
+ struct net_device *new_dev;
+ int res, itype;
+
+ switch (type) {
+ case NL80211_IFTYPE_UNSPECIFIED:
+ itype = IEEE80211_IF_TYPE_STA;
+ break;
+ case NL80211_IFTYPE_ADHOC:
+ itype = IEEE80211_IF_TYPE_IBSS;
+ break;
+ case NL80211_IFTYPE_STATION:
+ itype = IEEE80211_IF_TYPE_STA;
+ break;
+ case NL80211_IFTYPE_AP:
+ itype = IEEE80211_IF_TYPE_AP;
+ break;
+ case NL80211_IFTYPE_WDS:
+ itype = IEEE80211_IF_TYPE_WDS;
+ break;
+ case NL80211_IFTYPE_MONITOR:
+ itype = IEEE80211_IF_TYPE_MNTR;
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ res = rtnl_lock_local(local);
+ if (res)
+ return res;
+
+ res = ieee80211_if_add(local->mdev, name, 0, &new_dev);
+ if (res == 0)
+ ieee80211_if_set_type(new_dev, itype);
+ rtnl_unlock();
+ return res;
+}
+
+static int ieee80211_del_virtual_intf(void *priv, int ifindex) {
+ struct ieee80211_local *local = priv;
+ int res;
+ struct net_device *dev;
+ char *name;
+
+ res = rtnl_lock_local(local);
+ if (res)
+ return res;
+ dev = dev_get_by_index(ifindex);
+ name = dev->name;
+ dev_put(dev);
+
+ res = ieee80211_if_remove(local->mdev, name, -1);
+ rtnl_unlock();
+ return res;
+}
+
+static struct cfg80211_ops d80211cfg = {
+ .list_interfaces = ieee80211_interfaces,
+ .inject_packet = ieee80211_inject,
+ .add_virtual_intf = ieee80211_add_virtual_intf,
+ .del_virtual_intf = ieee80211_del_virtual_intf, };
+
+int ieee80211_cfg_init(struct ieee80211_local *local) {
+ return cfg80211_register(&d80211cfg, local); }
+
+void ieee80211_cfg_exit(struct ieee80211_local *local) {
+ cfg80211_unregister(local);
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ wireless-dev/net/d80211/ieee80211_cfg.h 2006-09-13
22:06:12.569647141 +0200
@@ -0,0 +1,9 @@
+#ifndef __IEEE80211_CFG_H
+#define __IEEE80211_CFG_H
+
+#include "ieee80211_i.h"
+
+extern int ieee80211_cfg_init(struct ieee80211_local *local); extern +void ieee80211_cfg_exit(struct ieee80211_local *local);
+
+#endif /* __IEEE80211_CFG_H */
--- wireless-dev.orig/net/d80211/ieee80211_i.h 2006-09-13
22:06:09.219647141 +0200
+++ wireless-dev/net/d80211/ieee80211_i.h 2006-09-13
22:06:12.569647141 +0200
@@ -153,12 +153,13 @@ struct ieee80211_txrx_data { struct ieee80211_tx_packet_data {
int ifindex;
unsigned long jiffies;
- unsigned int req_tx_status:1;
- unsigned int do_not_encrypt:1;
- unsigned int pkt_probe_resp:1;
- unsigned int requeue:1;
- unsigned int queue:4;
- unsigned int mgmt_iface:1;
+/* we simply re-use NL80211_FLAG_* here */
+ unsigned int flags;
+ unsigned int queue;
+#define TX_FLAG_INJECTED (1<<0)
+#define TX_FLAG_REQUEUE (1<<1)
+#define TX_FLAG_PROBERESP (1<<2)
+ unsigned int internal_flags;
};

struct ieee80211_tx_stored_packet {
--- wireless-dev.orig/net/d80211/ieee80211_sta.c 2006-09-13
22:05:52.019647141 +0200
+++ wireless-dev/net/d80211/ieee80211_sta.c 2006-09-13
22:06:12.579647141 +0200
@@ -21,6 +21,7 @@
#include <linux/if_arp.h>
#include <linux/wireless.h>
#include <linux/random.h>
+#include <linux/nl80211.h>
#include <net/iw_handler.h>
#include <asm/types.h>
#include <asm/delay.h>
@@ -396,10 +397,12 @@ static void ieee80211_sta_tx(struct net_
pkt_data = (struct ieee80211_tx_packet_data *) skb->cb; memset(pkt_data, 0, sizeof(struct ieee80211_tx_packet_data)); pkt_data->ifindex = sdata->dev->ifindex;
- pkt_data->mgmt_iface = (sdata->type == IEEE80211_IF_TYPE_MGMT);
- pkt_data->do_not_encrypt = !encrypt;
+ if (sdata->type == IEEE80211_IF_TYPE_MGMT)
+ pkt_data->internal_flags |= TX_FLAG_INJECTED;
+ if (encrypt)
+ pkt_data->flags |= NL80211_FLAG_ENCRYPT;
if (probe_resp)
- pkt_data->pkt_probe_resp = 1;
+ pkt_data->internal_flags |= TX_FLAG_PROBERESP;

dev_queue_xmit(skb);
}
--- wireless-dev.orig/net/d80211/wme.c 2006-09-13 22:05:52.089647141
+0200
+++ wireless-dev/net/d80211/wme.c 2006-09-13 22:06:12.579647141
+0200
@@ -11,6 +11,7 @@
#include <linux/module.h>
#include <linux/if_arp.h>
#include <linux/types.h>
+#include <linux/nl80211.h>
#include <net/ip.h>
#include <net/pkt_sched.h>

@@ -190,7 +191,8 @@ static inline int classify80211(struct s
return IEEE80211_TX_QUEUE_DATA0;
}

- if (unlikely(pkt_data->mgmt_iface)) {
+ /* FIXME: this needs to be revisited for more generic injection
*/
+ if (unlikely(pkt_data->internal_flags & TX_FLAG_INJECTED)) {
/* Data frames from hostapd (mainly, EAPOL) use AC_VO
* and they will include QoS control fields if
* the target STA is using WME. */
@@ -236,7 +238,7 @@ static int wme_qdiscop_enqueue(struct sk
struct Qdisc *qdisc;
int err, queue;

- if (pkt_data->requeue) {
+ if (pkt_data->internal_flags & TX_FLAG_REQUEUE) {
skb_queue_tail(&q->requeued[pkt_data->queue], skb); return 0;
}

-
To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected] More majordomo info at
http://vger.kernel.org/majordomo-info.html

author maintainer
#7 lore raw

RE: [RFC 2/3] make d80211 use cfg80211

Simon,

Quoted 2 lines

Does the packet injection allow hostapd to use nl80211 instead of the wlan0ap interface to send management frames?

It's intended that it does that, yes.

Quoted 3 lines

Important features for this
include requesting a transmit status - i.e. the ability for hostapd/wpa_supplicant to know if the frame got acked or not.

Yeah, I'm aware of that. I think it can actually request the transmit status now using the flags (would have to check), but the transmit status won't get sent over netlink but still over the wlan0ap interface. I haven't modified that part yet, but it shouldn't be hard to do.

I'll have to look at that closer some time (soon). I think if you request the transmit status I'll have to save the netlink_pid of the request and then unicast back the transmit status. That shouldn't be hard to do at all (obviously requires that hostapd keeps the netlink socket open but it should do that anyway)

johannes

author maintainer
#8 lore raw

RFC 3/3 cfg80211 thoughts on configuration

In reply to Johannes Berg

This is some preliminary code how I'm currently thinking (and that might change radically :) ) configuration might look like.

It uses the patch I previously posted to make genetlink attributes custom-definable.

include/linux/nl80211.h +80 -0
@@ -45,6 +45,47 @@ enum {
 	/* get list of all interfaces belonging to a wiphy */
 	NL80211_CMD_NEW_INTERFACES,
 
+	/* configure device */
+	NL80211_CMD_CONFIGURE,
+
+	/* request configuration */
+	NL80211_CMD_GET_CONFIG,
+
+	/* configuration sent from kernel */
+	NL80211_CMD_CONFIGURATION,
+
+	/* initiate scan */
+	NL80211_CMD_INITIATE_SCAN,
+
+	/* scan result (kernel -> userspace) */
+	NL80211_CMD_SCAN_RESULT,
+
+	/* change roaming control */
+	NL80211_CMD_SET_ROAMING_CONTROL,
+
+	/* get roaming control setting */
+	NL80211_CMD_GET_ROAMING_CONTROL,
+
+	/* set access point BSSID for userspace roaming */
+	NL80211_CMD_SET_BSSID,
+
+	/* get current association information, if not associated then
+	 * the BSSID attribute is not present in response */
+	NL80211_CMD_GET_ASSOCIATION,
+
+	/* association notification/response to GET_BSSID */
+	NL80211_CMD_ASSOCIATION_CHANGED,
+
+	/* disassociate from current AP */
+	NL80211_CMD_DISASSOCIATE,
+
+	/* deauth from current AP */
+	NL80211_CMD_DEAUTH,
+
+	/* re-associate with current settings
+	 * (SSID and BSSID if roaming control in userspace) */
+	NL80211_CMD_REASSOCIATE,
+
 	/* add commands here */
 
 	/* used to define NL80211_CMD_MAX below */
@@ -88,6 +129,36 @@ 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,
+
+	/* receiver sensitivity in dBm */
+	NL80211_ATTR_RX_SENSITIVITY,
+
+	/* BSSID to associate to, only used when roaming control
+	 * is in userspace */
+	NL80211_ATTR_BSSID,
+
+	/* SSID of ESS to associate to */
+	NL80211_ATTR_SSID,
+
+	/* transmit power in mW */
+	NL80211_ATTR_TRANSMIT_POWER,
+
+	/* fragmentation threshold in bytes */
+	NL80211_ATTR_FRAG_THRESHOLD,
+
+	/* one or more information elements */
+	NL80211_ATTR_INFORMATION_ELEMENT,
+
+	NL80211_ATTR_ROAMING_CONTROL,
+
+	NL80211_ATTR_SCAN_TYPE,
+
 	/* add attributes here */
 
 	/* used to define NL80211_ATTR_MAX below */
@@ -134,4 +205,13 @@ enum {
 };
 #define NL80211_IFTYPE_MAX (__NL80211_IFTYPE_AFTER_LAST - 1)
 
+enum {
+	NL80211_ROAMING_CONTROL_KERNEL,
+	NL80211_ROAMING_CONTROL_USERSPACE,
+
+	/* keep last */
+	__NL80211_ROAMING_CONTROL_AFTER_LAST
+};
+#define NL80211_ROAMING_CONTROL_MAX (__NL80211_ROAMING_CONTROL_AFTER_LAST-1)
+
 #endif /* __LINUX_NL80211_H */
include/net/cfg80211.h +62 -8

88 lines not on this page · raw message

net/wireless/nl80211.c +104 -0

128 lines not on this page · raw message

net/wireless/wext-compat.c new file +25 -0
@@ -0,0 +1,25 @@
+/* NOT YET */
+
+To implement compatibility, we add a new field to struct net_device
+that contains the pending configuration structure. This is dynamically
+allocated when needed and freed when committed.
+In a way it replaces the wireless_handlers field in there which is now
+done by dynamic lookup. No worries. No one is going to have thousands
+of wireless devices, and if that changes we can still trivially change
+this assumption :)
+
+Commit is done some time after the last parameter was changed
+(with each parameter change simply (re-)schedule a timer) or
+if explicitly asked for. This is probably not what most people
+would expect, but perfectly fine in the WE API.
+
+compatibility mappings:
+
+SIOCSIWAP
+  -> if bssid is all-ones: set roaming to kernel, reassociate
+  -> if bssid is all-zeroes: set roaming to kernel
+  -> otherwise: set roaming to userspace, set bssid
+
+SIOCGIWAP
+  -> get association parameters and fill return bssid appropriately
+
#9 lore raw

Re: [RFC 3/3] cfg80211 thoughts on configuration

* Johannes Berg <[email protected]> 2006-09-14 12:53

Quoted 10 lines

This is some preliminary code how I'm currently thinking (and that might change radically :) ) configuration might look like.

It uses the patch I previously posted to make genetlink attributes custom-definable.

include/linux/nl80211.h +0 -0
@@ -45,6 +45,47 @@ enum {
 	/* get list of all interfaces belonging to a wiphy */

include/linux/nl80211.h enum { · line 55

Quoted 10 lines
include/linux/nl80211.h +8 -0
 	NL80211_CMD_NEW_INTERFACES,
 
+	/* configure device */
+	NL80211_CMD_CONFIGURE,
+
+	/* request configuration */
+	NL80211_CMD_GET_CONFIG,
+
+	/* configuration sent from kernel */
+	NL80211_CMD_CONFIGURATION,

I think I brought this up already, it's a lot easier to understand things if you keep it symmetric, i.e. NL80211_CMD_GET_CONFIG triggers sending a NL80211_CMD_NEW_CONFIG.

Quoted 21 lines
include/linux/nl80211.h +15 -0
+static int check_information_element(struct nlattr *nla)
+{
+	int len = nla_len(nla);
+	u8 *data = nla_data(nla);
+	int elementlen;
+
+	while (len >= 2) {
+		/* 1 byte ID, 1 byte len, `len' bytes data */
+		elementlen = *(data+1) + 2;
+		data += elementlen;
+		len -= elementlen;
+	}
+	return len ? -EINVAL : 0;
+}
+
 static struct nla_policy nl80211_policy[NL80211_ATTR_MAX+1] __read_mostly = {
 	[NL80211_ATTR_IFINDEX] = { .type = NLA_U32 },
 	[NL80211_ATTR_WIPHY] = { .type = NLA_U32 },
@@ -33,6 +49,17 @@ static struct nla_policy nl80211_policy[
 				 .len = NL80211_MAX_FRAME_LEN },
 	[NL80211_ATTR_IFNAME] = { .type = NLA_NUL_STRING, .len = IFNAMSIZ-1 },

include/linux/nl80211.h static struct nla_policy nl80211_policy[ · line 60

Quoted 10 lines
include/linux/nl80211.h +9 -0
 	[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 = 6 },
+	[NL80211_ATTR_SSID] = { .type = NLA_STRING, .len = 32 },
+	[NL80211_ATTR_TRANSMIT_POWER] = { .type = NLA_U32 },
+	[NL80211_ATTR_FRAG_THRESHOLD] = { .type = NLA_U32 },
+	[NL80211_ATTR_INFORMATION_ELEMENT] = { .type = NLA_CUSTOM_CHECK,
+					       .check = check_information_element },

Just use a nested attribute here, this new array format you introduce having 1 byte ID, 1 byte len is equivalent to using a set of nested attributes with nla_type=id, nla_len=len.

author maintainer
#10 lore raw

Re: [RFC 3/3] cfg80211 thoughts on configuration

Quoted 3 lines · Thomas Graf

I think I brought this up already, it's a lot easier to understand things if you keep it symmetric, i.e. NL80211_CMD_GET_CONFIG triggers sending a NL80211_CMD_NEW_CONFIG.

Yes, I think you did :) I'll do that as soon as I get around to reworking it (hoping for more comments...)

Quoted 3 lines

Just use a nested attribute here, this new array format you introduce having 1 byte ID, 1 byte len is equivalent to using a set of nested attributes with nla_type=id, nla_len=len.

No, it is only validated, it is then supposed to be copied verbatim into some 802.11 frames. I thought validating it would be a good idea to not send out totally bogus frames, but I didn't want to have to mangle it in the kernel.

johannes

#11 lore raw

Re: [RFC 3/3] cfg80211 thoughts on configuration

* Johannes Berg <[email protected]> 2006-09-20 09:03

Quoted 8 lines
Quoted 3 lines

Just use a nested attribute here, this new array format you introduce having 1 byte ID, 1 byte len is equivalent to using a set of nested attributes with nla_type=id, nla_len=len.

No, it is only validated, it is then supposed to be copied verbatim into some 802.11 frames. I thought validating it would be a good idea to not send out totally bogus frames, but I didn't want to have to mangle it in the kernel.

I see, fair enough, wasn't able to get that from your code.

#12 lore raw
In reply to Johannes Berg
Quoted 5 lines · Johannes Berg

Hi,

Last night I thought a bit more about configuration handling with cfg80211/nl80211 and have refined the original framework to be more split into cfg80211 and nl80211 stuff.

Can you describe a bit more what the scope of each of nl80211 and cfg80211 is? Not sure I entirely understand the split and where the line is drawn.

Thanks,
Dan

Quoted 10 lines

As a followup, I'll post three patches, the first two are essentially the original ones respun, while the third one represents my current thoughts (a bit less I guess) on actual configuration and WE compatibility.

johannes
-
To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

author maintainer
#13 lore raw
Quoted 3 lines · Dan Williams

Can you describe a bit more what the scope of each of nl80211 and cfg80211 is? Not sure I entirely understand the split and where the line is drawn.

Basically, I figured that cfg80211 is the kernel-internal interface and nl80211 is just the primary userspace interface with WE compatibility being a second one and possibly partial configurability in configfs later. All drivers need to care about is cfg80211, hence I made the split explicit.

johannes