This is an attempt to rewrite the Wireless Extensions
userspace API, using netlink sockets.
There should also be a notification API, to inform
userspace for changes (config changes, state changes, etc).
It is not implemented, yet.
This is against the devicescape stack.
This patch is not to be used, but only to be commented on. ;)
Basically I would like comments on the API definition
in wconf.h
diff -urNX linux-2.6.15-ds060105.orig/Documentation/dontdiff linux-2.6.15-ds060105.orig/include/net/ieee80211.h linux-2.6.15-ds060105/include/net/ieee80211.h
--- linux-2.6.15-ds060105.orig/include/net/ieee80211.h 2006-01-08 02:10:46.000000000 +0100
+++ linux-2.6.15-ds060105/include/net/ieee80211.h 2006-01-09 16:22:59.000000000 +0100
@@ -10,6 +10,8 @@
#ifndef IEEE80211_H
#define IEEE80211_H
+#include <linux/netdevice.h>
+#include <net/wconf.h>
#include "ieee80211_shared.h"
/* Note! Only ieee80211_tx_status_irqsafe() and ieee80211_rx_irqsave() can be
@@ -591,35 +593,41 @@
int (*atheros_xr_in_use)(struct net_device *dev, int in_use);
};
+struct ieee80211_device {
+ /* Device name string. Usually "wlanX". */
+ __u8 name[IFNAMSIZ + 1];
+ /* Hardware data. */
+ struct ieee80211_hw *hw;
+ /* Wireless Configuration data. */
+ struct wconf_device *wconf;
+ struct net_device *dev;/*TODO: We want to get rid of the master net_device
+ and use ieee80211_device instead. */
+};
+
/* Allocate a new hardware device. This must be called once for each
* hardware device. The returned pointer must be used to refer to this
* device when calling other functions. 802.11 code allocates a private data
* area for the low-level driver. The size of this area is given as
* priv_data_len. ieee80211_dev_hw_data() is used to get a pointer to the
- * private data area.
- *
- * Note: in this version of the interface the returned pointer is struct
- * net_device *. This may change in the future and low-level driver should
- * not refer the device data directly to remain compatible with the future
- * versions of the interface. */
-struct net_device *ieee80211_alloc_hw(size_t priv_data_len,
- void (*setup)(struct net_device *));
+ * private data area. */
+struct ieee80211_device * ieee80211_alloc_hw(size_t priv_data_len,
+ void (*setup)(struct net_device *));
/* Register hardware device to the IEEE 802.11 code and kernel. Low-level
* drivers must call this function before using any other IEEE 802.11
* function. */
-int ieee80211_register_hw(struct net_device *dev, struct ieee80211_hw *hw);
+int ieee80211_register_hw(struct ieee80211_device *dev, struct ieee80211_hw *hw);
/* This function is allowed to update hardware configuration (e.g., list of
* supported operation modes and rates). */
-int ieee80211_update_hw(struct net_device *dev, struct ieee80211_hw *hw);
+int ieee80211_update_hw(struct ieee80211_device *dev, struct ieee80211_hw *hw);
/* Unregister a hardware device. This function instructs 802.11 code to free
* allocated resources and unregister netdevices from the kernel. */
-void ieee80211_unregister_hw(struct net_device *dev);
+void ieee80211_unregister_hw(struct ieee80211_device *dev);
/* Free allocated net_device including private data of a driver. */
-void ieee80211_free_hw(struct net_device *dev);
+void ieee80211_free_hw(struct ieee80211_device *dev);
/* Receive frame callback function. The low-level driver uses this function to
* send received frames to the IEEE 802.11 code. Receive buffer (skb) must
diff -urNX linux-2.6.15-ds060105.orig/Documentation/dontdiff linux-2.6.15-ds060105.orig/include/net/wconf.h linux-2.6.15-ds060105/include/net/wconf.h
--- linux-2.6.15-ds060105.orig/include/net/wconf.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.15-ds060105/include/net/wconf.h 2006-01-11 21:53:55.000000000 +0100
@@ -0,0 +1,151 @@
+/* wconf -- Linux Wireless Networking configuration interface. */
+
+#ifndef LINUX_WCONF_H_
+#define LINUX_WCONF_H_
+
+#include <linux/types.h>
+#include <linux/if.h>
+
+#define ESSID_MAX 32
+#define NETLINK_WCONF 17 /*TODO: move me to linux/netlink.h and assign a sane number. */
+
+/*** USERMODE API ***/
+
+/*TODO: This is currently only a configuration-parameter API (like WE currently is)
+ * This must be extened with a (separate) notification interface.
+ */
+
+enum {
+ WCONF_CMD_NAME,
+ WCONF_CMD_NICK,
+ WCONF_CMD_MODE,
+ WCONF_CMD_CHANNEL,
+ WCONF_CMD_SENSITIVITY,
+ //TODO
+ WCONF_NR_STANDARD, /* Number of standard commands. */
+ WCONF_CMD_FIRSTPRIV = 0x0001FFFF,
+ WCONF_CMD_LASTPRIV = 0xFFFFFFFF,
+};
+
+enum {
+ WCONF_MODE_AUTO, /* Let the driver decides */
+ WCONF_MODE_ADHOC, /* Single cell network */
+ WCONF_MODE_INFRA, /* Multi cell network, roaming, ... */
+ WCONF_MODE_MASTER, /* Synchronisation master or Access Point */
+ WCONF_MODE_REPEAT, /* Wireless Repeater (forwarder) */
+ WCONF_MODE_SECOND, /* Secondary master/repeater (backup) */
+ WCONF_MODE_MONITOR, /* Passive monitor (listen only) */
+};
+
+struct wconf_cmd_name {
+ __u8 name[IFNAMSIZ];
+};
+
+struct wconf_cmd_nick {
+ __u8 nick[ESSID_MAX];
+};
+
+struct wconf_cmd_mode {
+ int mode;
+};
+
+struct wconf_cmd_channel {
+ /** Frequency in KHz, or channel number if < 1000 */
+ __u32 freq;
+ __u8 flags;
+#define WCONF_CHAN_AUTO (1 << 0)
+#define WCONF_CHAN_FIXED (1 << 1)
+};
+
+struct wconf_cmd_sensitivity {
+};
+//TODO
+
+struct wconf_message {
+ __u16 wconf_ver;
+#define WCONF_VERSION 1
+ __u8 dest[IFNAMSIZ + 1];
+ __u32 command;
+ __u32 flags;
+#define WCONF_FLAG_SET (1 << 0)
+#define WCONF_FLAG_REPLY (1 << 1)
+ __u32 seq;
+ __u32 reserved;
+ int errorcode;
+ union {
+ struct wconf_cmd_name name;
+ struct wconf_cmd_nick nick;
+ struct wconf_cmd_mode mode;
+ struct wconf_cmd_channel channel;
+ struct wconf_cmd_sensitivity sensitivity;
+ //TODO
+ };
+};
+
+
+#ifdef __KERNEL__
+
+/*** KERNEL API (Driver and internal) ***/
+
+/*TODO: Handler functions are currently not implemented. They must be hooked up by the
+ * ieee80211 subsystem (and must be implemented as part of the ieee80211 subsys).
+ * Where applicable, the drivers must re-hook the handler functions (for hardware
+ * MAC for example).
+ */
+
+#include <linux/list.h>
+#include <linux/spinlock.h>
+#include <net/ieee80211.h>
+
+struct sock;
+struct ieee80211_device;
+
+/** Function type for standard and private handler functions. */
+typedef int (* wconf_handler_t)(struct ieee80211_device *dev,
+ struct wconf_message *msg);
+
+struct wconf_privhandler_table {
+ /** Number of "handlers" */
+ size_t nr_handlers;
+ /** Array of handler-function-pointers.
+ * This array is accessed by
+ * (WCONF_CMD_FIRSTPRIV - (priv command)) index.
+ */
+ wconf_handler_t *handlers;
+};
+
+struct wconf_device {
+ struct list_head list;
+ spinlock_t lock;
+
+ struct ieee80211_device *dev;
+ wconf_handler_t handlers[WCONF_NR_STANDARD];
+ struct wconf_privhandler_table priv_handlers;
+};
+
+/*** DRIVER API ***/
+
+/** Hook one of the standard handlers.
+ * Returns the old handler (or NULL if there wasn't one)
+ */
+wconf_handler_t wconf_handler_hook(struct wconf_device *dev,
+ __u32 command,
+ wconf_handler_t new_handler);
+
+/** Set the private handlers table.
+ * "table" is copied, so can be temporal and deleted after this
+ * function returns.
+ */
+int wconf_set_privhandlers(struct wconf_device *wd,
+ struct wconf_privhandler_table *table);
+
+
+/*** INTERNAL API ***/
+
+int wconf_register(struct ieee80211_device *dev);
+void wconf_unregister(struct ieee80211_device *dev);
+int wconf_init(void);
+void wconf_exit(void);
+
+#endif /* __KERNEL__ */
+#endif /* LINUX_WCONF_H_ */
diff -urNX linux-2.6.15-ds060105.orig/Documentation/dontdiff linux-2.6.15-ds060105.orig/net/ieee80211/ieee80211.c linux-2.6.15-ds060105/net/ieee80211/ieee80211.c
--- linux-2.6.15-ds060105.orig/net/ieee80211/ieee80211.c 2006-01-08 02:09:46.000000000 +0100
+++ linux-2.6.15-ds060105/net/ieee80211/ieee80211.c 2006-01-10 22:06:55.000000000 +0100
@@ -24,6 +24,7 @@
#include <linux/wireless.h>
#include <net/iw_handler.h>
#include <linux/compiler.h>
+#include <net/wconf.h>
#include <net/ieee80211.h>
#include <net/ieee80211_common.h>
@@ -4359,13 +4360,14 @@
}
-struct net_device *ieee80211_alloc_hw(size_t priv_data_len,
- void (*setup)(struct net_device *))
+struct ieee80211_device *ieee80211_alloc_hw(size_t priv_data_len,
+ void (*setup)(struct net_device *))
{
struct net_device *dev, *apdev, *mdev;
struct ieee80211_local *local;
struct ieee80211_sub_if_data *sdata;
int alloc_size;
+ struct ieee80211_device *ieee;
/* Ensure 32-bit alignment of our private data and hw private data.
* Each net_device is followed by a sub_if_data which which is used
@@ -4404,6 +4406,14 @@
if (mdev == NULL)
return NULL;
+ //TODO: This is only a tempoary hack.
+ ieee = kzalloc(sizeof(*ieee), GFP_KERNEL);
+ if (!ieee) {
+ kfree(mdev);
+ return NULL;
+ }
+ ieee->dev = mdev;
+
mdev->priv = (struct net_device *)
(((long) mdev +
sizeof(struct net_device) +
@@ -4539,16 +4549,16 @@
if (setup)
setup(mdev);
- return mdev;
+ return ieee;
fail:
- ieee80211_free_hw(mdev);
+ ieee80211_free_hw(ieee);
return NULL;
}
-int ieee80211_register_hw(struct net_device *dev, struct ieee80211_hw *hw)
+int ieee80211_register_hw(struct ieee80211_device *dev, struct ieee80211_hw *hw)
{
- struct ieee80211_local *local = dev->priv;
+ struct ieee80211_local *local = dev->dev->priv;
int result;
if (!hw)
@@ -4560,6 +4570,7 @@
IEEE80211_VERSION, hw->version);
return -1;
}
+ dev->hw = hw;
local->conf.mode = IW_MODE_MASTER;
local->conf.beacon_int = 1000;
@@ -4568,19 +4579,24 @@
sta_info_start(local);
+ result = wconf_register(dev);
+ if (result)
+ goto stop;
+
result = register_netdev(local->wdev);
if (result < 0)
- return -1;
+ goto wconf_unreg;
result = register_netdev(local->apdev);
if (result < 0)
goto fail_2nd_dev;
if (hw->fraglist)
- dev->features |= NETIF_F_FRAGLIST;
- result = register_netdev(dev);
+ dev->dev->features |= NETIF_F_FRAGLIST;
+ result = register_netdev(dev->dev);
if (result < 0)
goto fail_3rd_dev;
+ strcpy(dev->name, dev->dev->name);
if (rate_control_initialize(local) < 0) {
printk(KERN_DEBUG "%s: Failed to initialize rate control "
@@ -4589,25 +4605,28 @@
}
/* TODO: add rtnl locking around device creation and qdisc install */
- ieee80211_install_qdisc(dev);
+ ieee80211_install_qdisc(dev->dev);
ieee80211_wep_init(local);
ieee80211_proc_init_interface(local);
return 0;
fail_rate:
- unregister_netdev(dev);
+ unregister_netdev(dev->dev);
fail_3rd_dev:
unregister_netdev(local->apdev);
fail_2nd_dev:
unregister_netdev(local->wdev);
+wconf_unreg:
+ wconf_unregister(dev);
+stop:
sta_info_stop(local);
return result;
}
-int ieee80211_update_hw(struct net_device *dev, struct ieee80211_hw *hw)
+int ieee80211_update_hw(struct ieee80211_device *dev, struct ieee80211_hw *hw)
{
- struct ieee80211_local *local = dev->priv;
+ struct ieee80211_local *local = dev->dev->priv;
local->hw = hw;
@@ -4616,17 +4635,17 @@
if (hw->queues == 0)
hw->queues = 1;
- memcpy(local->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
- local->apdev->base_addr = dev->base_addr;
- local->apdev->irq = dev->irq;
- local->apdev->mem_start = dev->mem_start;
- local->apdev->mem_end = dev->mem_end;
-
- memcpy(local->wdev->dev_addr, dev->dev_addr, ETH_ALEN);
- local->wdev->base_addr = dev->base_addr;
- local->wdev->irq = dev->irq;
- local->wdev->mem_start = dev->mem_start;
- local->wdev->mem_end = dev->mem_end;
+ memcpy(local->apdev->dev_addr, dev->dev->dev_addr, ETH_ALEN);
+ local->apdev->base_addr = dev->dev->base_addr;
+ local->apdev->irq = dev->dev->irq;
+ local->apdev->mem_start = dev->dev->mem_start;
+ local->apdev->mem_end = dev->dev->mem_end;
+
+ memcpy(local->wdev->dev_addr, dev->dev->dev_addr, ETH_ALEN);
+ local->wdev->base_addr = dev->dev->base_addr;
+ local->wdev->irq = dev->dev->irq;
+ local->wdev->mem_start = dev->dev->mem_start;
+ local->wdev->mem_end = dev->dev->mem_end;
if (!hw->modes || !hw->modes->channels || !hw->modes->rates ||
!hw->modes->num_channels || !hw->modes->num_rates)
@@ -4636,7 +4655,7 @@
local->conf.phymode = hw->modes[0].mode;
local->curr_rates = hw->modes[0].rates;
local->num_curr_rates = hw->modes[0].num_rates;
- ieee80211_prepare_rates(dev);
+ ieee80211_prepare_rates(dev->dev);
local->conf.freq = local->hw->modes[0].channels[0].freq;
local->conf.channel = local->hw->modes[0].channels[0].chan;
@@ -4646,22 +4665,24 @@
return 0;
}
-void ieee80211_unregister_hw(struct net_device *dev)
+void ieee80211_unregister_hw(struct ieee80211_device *dev)
{
- struct ieee80211_local *local = dev->priv;
+ struct ieee80211_local *local = dev->dev->priv;
struct list_head *ptr, *n;
int i;
tasklet_disable(&local->tasklet);
/* TODO: skb_queue should be empty here, no need to do anything? */
+ wconf_unregister(dev);
+
if (local->rate_limit)
del_timer_sync(&local->rate_limit_timer);
if (local->stat_time)
del_timer_sync(&local->stat_timer);
if (local->scan_timer.data)
del_timer_sync(&local->scan_timer);
- ieee80211_rx_bss_list_deinit(dev);
+ ieee80211_rx_bss_list_deinit(dev->dev);
list_for_each_safe(ptr, n, &local->sub_if_list) {
struct ieee80211_sub_if_data *sdata =
@@ -4687,19 +4708,20 @@
if (skb_queue_len(&local->skb_queue)
|| skb_queue_len(&local->skb_queue_unreliable))
- printk(KERN_WARNING "%s: skb_queue not empty", dev->name);
+ printk(KERN_WARNING "%s: skb_queue not empty", dev->dev->name);
skb_queue_purge(&local->skb_queue);
skb_queue_purge(&local->skb_queue_unreliable);
rate_control_free(local);
}
-void ieee80211_free_hw(struct net_device *dev)
+void ieee80211_free_hw(struct ieee80211_device *dev)
{
- struct ieee80211_local *local = dev->priv;
+ struct ieee80211_local *local = dev->dev->priv;
kfree(local->sta_devs);
kfree(local->bss_devs);
+ kfree(dev->dev);
kfree(dev);
}
@@ -4819,7 +4841,9 @@
static int __init ieee80211_init(void)
{
+ int err;
struct sk_buff *skb;
+
if (sizeof(struct ieee80211_tx_packet_data) > (sizeof(skb->cb))) {
printk("80211: ieee80211_tx_packet_data is bigger "
"than the skb->cb (%d > %d)\n",
@@ -4828,18 +4852,23 @@
return -EINVAL;
}
+ err = wconf_init();
+ if (err)
+ goto out;
ieee80211_proc_init();
- {
- int ret = ieee80211_wme_register();
- if (ret) {
- printk(KERN_DEBUG "ieee80211_init: failed to "
- "initialize WME (err=%d)\n", ret);
- ieee80211_proc_deinit();
- return ret;
- }
+ err = ieee80211_wme_register();
+ if (err) {
+ printk(KERN_DEBUG "ieee80211_init: failed to "
+ "initialize WME (err=%d)\n", err);
+ goto err_proc;
}
- return 0;
+out:
+ return err;
+err_proc:
+ ieee80211_proc_deinit();
+ wconf_exit();
+ goto out;
}
@@ -4847,6 +4876,7 @@
{
ieee80211_wme_unregister();
ieee80211_proc_deinit();
+ wconf_exit();
}
diff -urNX linux-2.6.15-ds060105.orig/Documentation/dontdiff linux-2.6.15-ds060105.orig/net/ieee80211/Makefile linux-2.6.15-ds060105/net/ieee80211/Makefile
--- linux-2.6.15-ds060105.orig/net/ieee80211/Makefile 2006-01-08 02:09:46.000000000 +0100
+++ linux-2.6.15-ds060105/net/ieee80211/Makefile 2006-01-08 02:53:10.000000000 +0100
@@ -12,7 +12,8 @@
michael.o \
tkip.o \
aes_ccm.o \
- wme.o
+ wme.o \
+ wconf.o
ifeq ($(CONFIG_NET_SCHED),)
80211-objs += fifo_qdisc.o
diff -urNX linux-2.6.15-ds060105.orig/Documentation/dontdiff linux-2.6.15-ds060105.orig/net/ieee80211/wconf.c linux-2.6.15-ds060105/net/ieee80211/wconf.c
--- linux-2.6.15-ds060105.orig/net/ieee80211/wconf.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.15-ds060105/net/ieee80211/wconf.c 2006-01-11 21:56:42.000000000 +0100
@@ -0,0 +1,221 @@
+#include <net/wconf.h>
+#include <net/netlink.h>
+#include <net/sock.h>
+#include <linux/netlink.h>
+#include <linux/slab.h>
+#include <linux/socket.h>
+#include <linux/skbuff.h>
+
+#define PFX "WCONF: "
+
+static struct wconf {
+ /* Netlink socket. */
+ struct sock *nl;
+ /* List of all devices. */
+ struct list_head devices;
+ spinlock_t lock;
+} wc;
+
+
+static inline
+int is_priv_command(u32 cmd)
+{
+ return (cmd >= WCONF_CMD_FIRSTPRIV && cmd <= WCONF_CMD_LASTPRIV);
+}
+
+static int wconf_handle_message(struct wconf_device *wd,
+ struct wconf_message *msg)
+{
+ u32 command = msg->command;
+ wconf_handler_t handler;
+ unsigned long flags;
+ int err = -EINVAL;
+
+ spin_lock_irqsave(&wd->lock, flags);
+ if (is_priv_command(command)) {
+ command -= WCONF_CMD_FIRSTPRIV;
+ if (command >= wd->priv_handlers.nr_handlers) {
+ printk(KERN_ERR PFX "Unknown private command\n");
+ goto out_unlock;
+ }
+ handler = wd->priv_handlers.handlers[command];
+ } else {
+ if (command >= WCONF_NR_STANDARD) {
+ printk(KERN_ERR PFX "Unknown command\n");
+ goto out_unlock;
+ }
+ handler = wd->handlers[command];
+ }
+ if (!handler) {
+ err = -EOPNOTSUPP;
+ goto out_unlock;
+ }
+ err = handler(wd->dev, msg);
+
+out_unlock:
+ spin_unlock_irqrestore(&wd->lock, flags);
+
+ return err;
+}
+
+wconf_handler_t wconf_handler_hook(struct wconf_device *wd,
+ __u32 command,
+ wconf_handler_t new_handler)
+{
+ wconf_handler_t old_handler;
+ unsigned long flags;
+
+ BUG_ON(is_priv_command(command));
+ BUG_ON(command >= WCONF_NR_STANDARD);
+ spin_lock_irqsave(&wd->lock, flags);
+ old_handler = wd->handlers[command];
+ wd->handlers[command] = new_handler;
+ spin_unlock_irqrestore(&wd->lock, flags);
+
+ return old_handler;
+}
+EXPORT_SYMBOL_GPL(wconf_handler_hook);
+
+int wconf_set_privhandlers(struct wconf_device *wd,
+ struct wconf_privhandler_table *table)
+{
+ unsigned long flags;
+
+ spin_lock_irqsave(&wd->lock, flags);
+ memcpy(&wd->priv_handlers, table, sizeof(*table));
+ spin_unlock_irqrestore(&wd->lock, flags);
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(wconf_set_privhandlers);
+
+static struct wconf_device * find_wconf(u8 *name)
+{
+ struct wconf_device *wd;
+
+ list_for_each_entry(wd, &wc.devices, list) {
+ if (strcmp(wd->dev->name, name) == 0)
+ return wd;
+ }
+
+ return NULL;
+}
+
+static int wconf_send_reply(struct sock *sk,
+ u32 pid,
+ struct wconf_message *msg)
+{
+ struct nlmsghdr *nlh;
+ struct sk_buff *skb;
+
+ skb = __dev_alloc_skb(NLMSG_SPACE(sizeof(struct wconf_message)),
+ GFP_ATOMIC);
+ if (!skb)
+ return -ENOMEM;
+ nlh = (struct nlmsghdr *)skb->data;
+ nlh->nlmsg_len = NLMSG_SPACE(sizeof(struct wconf_message));
+ nlh->nlmsg_pid = 0;
+ nlh->nlmsg_flags = 0;
+ memcpy(NLMSG_DATA(nlh), msg, sizeof(*msg));
+ memset(&(NETLINK_CB(skb)), 0, sizeof(struct netlink_skb_parms));
+ NETLINK_CB(skb).dst_pid = pid;
+ netlink_unicast(sk, skb, pid, MSG_DONTWAIT);
+
+ return 0;
+}
+
+static void wconf_message_rx(struct sock *sk, int len)
+{
+ struct sk_buff *skb;
+ struct nlmsghdr *nlh = NULL;
+ struct wconf_message *msg;
+ struct wconf_device *wd;
+ int err;
+
+ while ((skb = skb_dequeue(&sk->sk_receive_queue)) != NULL) {
+ if (skb->len < NLMSG_SPACE(sizeof(struct wconf_message))) {
+ printk(KERN_ERR PFX "Invalid message\n");
+ goto cont;
+ }
+ nlh = (struct nlmsghdr *)skb->data;
+ msg = NLMSG_DATA(nlh);
+ if (msg->wconf_ver != WCONF_VERSION) {
+ printk(KERN_ERR PFX "Version mismatch "
+ "(msg: %u, kernel: %u)\n",
+ msg->wconf_ver, WCONF_VERSION);
+ goto cont;
+ }
+ msg->dest[ARRAY_SIZE(msg->dest) - 1] = '\0';
+ wd = find_wconf(msg->dest);
+ if (!wd) {
+ printk(KERN_ERR PFX "Unknown destination \"%s\"\n",
+ msg->dest);
+ goto cont;
+ }
+ err = wconf_handle_message(wd, msg);
+ msg->errorcode = err;
+ err = wconf_send_reply(sk, nlh->nlmsg_pid, msg);
+ if (err) {
+ printk(KERN_ERR PFX "Reply failed\n");
+ goto cont;
+ }
+ kfree_skb(skb);
+ }
+}
+
+int wconf_register(struct ieee80211_device *dev)
+{
+ int err = -ENOMEM;
+ struct wconf_device *wd;
+ unsigned long flags;
+
+ wd = kzalloc(sizeof(*wd), GFP_KERNEL);
+ if (!wd)
+ goto out;
+ wd->dev = dev;
+ dev->wconf = wd;
+ INIT_LIST_HEAD(&wd->list);
+ spin_lock_init(&wd->lock);
+
+ spin_lock_irqsave(&wc.lock, flags);
+ list_add_tail(&wd->list, &wc.devices);
+ spin_unlock_irqrestore(&wc.lock, flags);
+
+ err = 0;
+out:
+ return err;
+}
+
+void wconf_unregister(struct ieee80211_device *dev)
+{
+ struct wconf_device *wd = dev->wconf;
+ unsigned long flags;
+
+ spin_lock_irqsave(&wc.lock, flags);
+ BUG_ON(list_empty(&wd->list));
+ list_del(&wd->list);
+ kfree(wd);
+ spin_unlock_irqrestore(&wc.lock, flags);
+}
+
+int wconf_init(void)
+{
+ int err = -ENOMEM;
+
+ wc.nl = netlink_kernel_create(NETLINK_WCONF, 1,
+ wconf_message_rx,
+ THIS_MODULE);
+ if (!wc.nl)
+ goto out;
+ INIT_LIST_HEAD(&wc.devices);
+ spin_lock_init(&wc.lock);
+
+ err = 0;
+out:
+ return err;
+}
+
+void wconf_exit(void)
+{
+ sock_release(wc.nl->sk_socket);
+}
--
Greetings Michael.
* Michael Buesch <[email protected]> 2006-01-12 18:24
> This is an attempt to rewrite the Wireless Extensions
> userspace API, using netlink sockets.
> There should also be a notification API, to inform
> userspace for changes (config changes, state changes, etc).
> It is not implemented, yet.
I'll only comment on the netlink bits and leave the rest to
others. I'd highly recommend the use of attributes instead
of fixed message structures to allow the interface to be
flexible to extensions while staying binary compatible.
Another idea might be to use the new generic netlink family
to make things a bit easier to use.
On Thu, 12 Jan 2006 18:24:02 +0100
Michael Buesch <[email protected]> wrote:
> This is an attempt to rewrite the Wireless Extensions
> userspace API, using netlink sockets.
> There should also be a notification API, to inform
> userspace for changes (config changes, state changes, etc).
> It is not implemented, yet.
>
> This is against the devicescape stack.
> This patch is not to be used, but only to be commented on. ;)
> Basically I would like comments on the API definition
> in wconf.h
>
1. You will need more documentation, eventually in Documentation directory.
2. Is there 1:1 relationship between ieee80211_device and net_device or
N net_devices per ieee80211_device?
3. Don't put a version number on the protocol messages. The way to
us netlink is to us Type Length Variable structures. And write the
code to ignore unknown types. Once you decide on a particular Type
then it has to be frozen for ABI compatibility. The version numbering
in the WE API is part of the problem
4. What about non-ieee80211 devices? With the growth of (mostly proprietary)
cell phone carrier wireless, you don't want to shut out that.
On P? 13-01-06 09:55:33, Stephen Hemminger wrote:
> On Thu, 12 Jan 2006 18:24:02 +0100
>
> 4. What about non-ieee80211 devices? With the growth of (mostly proprietary)
> cell phone carrier wireless, you don't want to shut out that.
Don't mix it here. Mobile phones normally talk using AT interface,
modem-like.
Pavel
--
Thanks, Sharp!
On Fri, Jan 13, 2006 at 02:15:03PM +0100, Thomas Graf wrote:
> * Michael Buesch <[email protected]> 2006-01-12 18:24
> > This is an attempt to rewrite the Wireless Extensions
> > userspace API, using netlink sockets.
> > There should also be a notification API, to inform
> > userspace for changes (config changes, state changes, etc).
> > It is not implemented, yet.
>
> I'll only comment on the netlink bits and leave the rest to
> others. I'd highly recommend the use of attributes instead
> of fixed message structures to allow the interface to be
> flexible to extensions while staying binary compatible.
I can only second Thomas' suggestion. The power and flexibility of the
use of netlink is only really unveiled if you use attributes. This way
you can easily extend your data structures later on without breaking
compatibility, etc.
--
- Harald Welte <[email protected]> http://gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
(ETSI EN 300 175-7 Ch. A6)