cfg80211 changes for wireless-dev
Subsystems (4)
[email protected]
maintainercover cfg80211 changes for wireless-dev
This makes the version of cfg80211 in wireless-dev mostly identical (except for nl80211) with the version I'm submitting for mainline.
johannes
[email protected]
maintainerPATCH 1/5 cfg80211: update to code submitted to mainline
This updates cfg80211 to be really similar to the code I submitted for mainline.
--- include/linux/netdevice.h | 8 include/linux/nl80211.h | 5 include/net/cfg80211.h | 134 +++- include/net/iw_handler.h | 3 include/net/wireless.h | 23 net/Kconfig | 14 net/core/dev.c | 67 -- net/wireless/Makefile | 24 net/wireless/core.c | 166 +++--- net/wireless/core.h | 43 - net/wireless/nl80211.c | 78 -- net/wireless/sysfs.c | 65 ++ net/wireless/sysfs.h | 10 net/wireless/wext-common.c | 65 ++ net/wireless/wext-compat.c | 1231 ++++++++------------------------------------- net/wireless/wext-export.c | 29 + net/wireless/wext-mod.c | 20 net/wireless/wext-old.c | 14 net/wireless/wext.h | 42 + 19 files changed, 701 insertions(+), 1340 deletions(-)
include/linux/netdevice.h +3 -5
@@ -42,6 +42,8 @@struct vlan_group ;struct ethtool_ops ;struct netpoll_info ; +/* 802.11 specific */ +struct wiphy ;/* source back-compat hooks */ #define SET_ETHTOOL_OPS (netdev,ops) \ ( (netdev)->ethtool_ops = (ops) )
@@ -355,10 +357,6 @@ struct net_device/* Instance data managed by the core of Wireless Extensions. */ struct iw_public_data * wireless_data;#endif -#ifdef CONFIG_CFG80211_WEXT_COMPAT -/* pending config used by cfg80211/wext compat code only */ -void *cfg80211_wext_pending_config; -#endif const struct ethtool_ops *ethtool_ops;/*
@@ -403,7 +401,7 @@ struct net_devicevoid *ip6_ptr;/* IPv6 specific data */ void *ec_ptr;/* Econet specific data */ void *ax25_ptr;/* AX.25 specific data */ -void *ieee80211_ptr;/* IEEE 802.11 specific data */ +struct wiphy *ieee80211_ptr;/* IEEE 802.11 specific data */ /* * Cache line mostly used on receive path (including eth_type_trans())
include/net/cfg80211.h +84 -50
221 lines not on this page · raw message
net/wireless/Makefile +12 -12
@@ -1,16 +1,16 @@ obj-$(CONFIG_CFG80211) += cfg80211.o -cfg80211-objs := \ - core.o nl80211.o +cfg80211-y += core.o sysfs.o nl80211.o +cfg80211-$(CONFIG_CFG80211_WEXT_COMPAT) += wext-compat.o -obj-$(CONFIG_WIRELESS_EXT) += wext-old.o +ifeq ($(CONFIG_CFG80211),m) +obj-$(CONFIG_CFG80211_WEXT_COMPAT) += wext-export.o +cfg80211-$(CONFIG_CFG80211_WEXT_COMPAT) += wext-mod.o +# we need something to tell us what's up... +# but we can't use #ifdef MODULE because we also need to +# know in the part that is built in (namely wext-common.c) +CFLAGS += -DCFG80211_MODULE +endif -obj-nn := -obj-yy := -obj-yn := -obj-ny := - -# this needs to be compiled in... -obj-$(CONFIG_CFG80211_WEXT_COMPAT) += wext-compat.o -obj-$(CONFIG_CFG80211_WEXT_COMPAT)$(CONFIG_NET_WIRELESS) += wext-common.o -obj-y += $(obj-yy) $(obj-yn) $(obj-ny) +obj-$(CONFIG_WIRELESS_EXT) += wext-common.o wext-old.o +obj-$(CONFIG_CFG80211_WEXT_COMPAT) += wext-common.o
net/wireless/core.c +87 -79
262 lines not on this page · raw message
net/wireless/core.h +19 -24
70 lines not on this page · raw message
net/wireless/sysfs.c new file +65 -0
65 lines not on this page · raw message
net/wireless/sysfs.h new file +10 -0
@@ -0,0 +1,10 @@ +#ifndef __WIRELESS_SYSFS_H +#define __WIRELESS_SYSFS_H + +extern int wiphy_sysfs_init (void ); +extern void wiphy_sysfs_exit (void ); + +extern int wiphy_sysfs_add (struct wiphy *wiphy); +extern void wiphy_sysfs_del (struct wiphy *wiphy); + +#endif /* __WIRELESS_SYSFS_H */
include/net/iw_handler.h +0 -3
@@ -433,9 +433,6 @@ struct iw_public_data {extern int dev_get_wireless_info (char * buffer,char **start,off_t offset,int length); -/* Handle IOCTLs, called in net/core/dev.c */ -extern int wireless_process_ioctl (struct ifreq *ifr,unsigned int cmd); -/* Handle RtNetlink requests, called in net/core/rtnetlink.c */ extern int wireless_rtnetlink_set(struct net_device * dev, char * data,
include/net/wireless.h new file +23 -0
@@ -0,0 +1,23 @@ +#ifndef __NET_WIRELESS_H +#define __NET_WIRELESS_H + +/* +* internal definitions for wireless +*/ + +#if defined(CONFIG_CFG80211_WEXT_COMPAT ) || defined(CONFIG_WIRELESS_EXT ) +int wext_ioctl (unsigned int cmd,struct ifreq *ifreq,void __user *arg); +int wireless_proc_init (void ); +#else +static inline +int wext_ioctl (unsigned int cmd,struct ifreq *ifreq,void __user *arg) +{ +return -EINVAL ; +} +static inline int wireless_proc_init (void ) +{ +return 0 ; +} +#endif + +#endif /* __NET_WIRELESS_H */
net/Kconfig +0 -14
@@ -244,20 +244,6 @@ config CFG80211_WEXT_COMPAT If unsure, say Y. -config CFG80211_WEXTNL_COMPAT - bool "cfg80211 WE-netlink compatibility" - depends CFG80211 && CFG80211_WEXT_COMPAT - ---help--- - This option allows using devices whose drivers have been - converted to use the new cfg80211 with wireless extensions - over rtnetlink, providing WE-20 compatibility. Note that - cfg80211's "native" interface is nl80211 using generic netlink. - The wireless extensions are being deprecated and the netlink - based API for WE was never configured by default, nor do any - userspace tools use this feature. - - This option exists only to make Jean happy. Say N. - endif # if NET endmenu # Networking
net/core/dev.c +4 -63
85 lines not on this page · raw message
net/wireless/wext-common.c +59 -6
95 lines not on this page · raw message
net/wireless/wext-compat.c +221 -1010
1,639 lines not on this page · raw message
net/wireless/wext-export.c new file +29 -0
@@ -0,0 +1,29 @@ +/* +* things we only need in the kernel when cfg80211 is modular. +* +* Copyright 2007 Johannes Berg <[email protected]> +*/ + +#include "wext.h" + +EXPORT_SYMBOL_GPL (wext_standard_ioctl); +EXPORT_SYMBOL_GPL (wext_standard_ioctl_num); +EXPORT_SYMBOL_GPL (get_wireless_stats); + +struct cfg80211_ioctl_ops cfg80211_ioctl_ops; +EXPORT_SYMBOL_GPL (cfg80211_ioctl_ops); + +int call_cfg80211_wext_ioctl (struct ifreq *ifr,unsigned int cmd) +{ +int err = -ENOSYS ; + +if (!try_module_get (cfg80211_ioctl_ops.module)) +return -ENOSYS ; + +if (cfg80211_ioctl_ops.do_wext_ioctl) + err = cfg80211_ioctl_ops.do_wext_ioctl (ifr, cmd); + +module_put (cfg80211_ioctl_ops.module); + +return err; +}
net/wireless/wext-mod.c new file +20 -0
@@ -0,0 +1,20 @@ +/* +* things we only need in cfg80211 when it is modular. +* +* Copyright 2007 Johannes Berg <[email protected]> +*/ + +#include "wext.h" + +int cfg80211_wext_init (void ) +{ + cfg80211_ioctl_ops.do_wext_ioctl = cfg80211_wext_ioctl; + cfg80211_ioctl_ops.module =THIS_MODULE ; +return 0 ; +} + +void cfg80211_wext_exit (void ) +{ + cfg80211_ioctl_ops.module =NULL ; + cfg80211_ioctl_ops.do_wext_ioctl =NULL ; +}
net/wireless/wext-old.c +7 -7
@@ -124,6 +124,7 @@ static const char iw_priv_type_size[] = 0, /* Not defined */ }; +/************************ COMMON SUBROUTINES ************************/ /* * Stuff that may be used in various place or doesn't fit in one
@@ -308,9 +309,9 @@ static int ioctl_standard_call(struct neint ret = -EINVAL ;/* Get the description of the IOCTL */ -if ((cmd -SIOCIWFIRST ) >= standard_ioctl_num) +if ((cmd -SIOCIWFIRST ) >= wext_standard_ioctl_num)return -EOPNOTSUPP ; - descr = &(standard_ioctl[cmd -SIOCIWFIRST ]); + descr = &(wext_standard_ioctl[cmd -SIOCIWFIRST ]);#ifdef WE_IOCTL_DEBUG printk(KERN_DEBUG "%s (WE) : Found standard handler for 0x%04X\n",
@@ -769,9 +770,9 @@ static int rtnetlink_standard_get(struct/* Get the description of the Request */ cmd = request->cmd; -if ((cmd -SIOCIWFIRST ) >= standard_ioctl_num) +if ((cmd -SIOCIWFIRST ) >= wext_standard_ioctl_num)return -EOPNOTSUPP ; - descr = &(standard_ioctl[cmd -SIOCIWFIRST ]); + descr = &(wext_standard_ioctl[cmd -SIOCIWFIRST ]);#ifdef WE_RTNETLINK_DEBUG printk(KERN_DEBUG "%s (WE.r) : Found standard handler for 0x%04X\n",
@@ -911,9 +912,9 @@ static inline int rtnetlink_standard_set/* Get the description of the Request */ cmd = request->cmd; -if ((cmd -SIOCIWFIRST ) >= standard_ioctl_num) +if ((cmd -SIOCIWFIRST ) >= wext_standard_ioctl_num)return -EOPNOTSUPP ; - descr = &(standard_ioctl[cmd -SIOCIWFIRST ]); + descr = &(wext_standard_ioctl[cmd -SIOCIWFIRST ]);#ifdef WE_RTNETLINK_DEBUG printk(KERN_DEBUG "%s (WE.r) : Found standard SET handler for 0x%04X\n",
@@ -1726,5 +1727,4 @@ EXPORT_SYMBOL(iw_handler_get_spy);EXPORT_SYMBOL (iw_handler_get_thrspy);EXPORT_SYMBOL (iw_handler_set_spy);EXPORT_SYMBOL (iw_handler_set_thrspy); -EXPORT_SYMBOL (wireless_send_event);EXPORT_SYMBOL (wireless_spy_update);
net/wireless/wext.h +38 -4
49 lines not on this page · raw message
net/wireless/nl80211.c +20 -58
207 lines not on this page · raw message
include/linux/nl80211.h +0 -5
@@ -20,11 +20,6 @@ enum {/* Supported commands returned */ NL80211_CMD_NEW_CMDLIST, -/* Inject a frame using NL80211_ATTR_FLAGS and NL80211_ATTR_FRAME. -* If kernel sends this, it's a status notification for the injected -* frame. */ - NL80211_CMD_INJECT, -/* add a virtual interface to a group that is identified by any * other ifindex in the group of a wiphy index, needs the * NL80211_IF_NAME attribute */
--
Johannes Berg
maintainerRe: [PATCH 1/5] cfg80211: update to code submitted to mainline
Quoted 10 lines · On Fri, 2007-02-09 at 17:24 +0100, [email protected] wrote:
net/wireless/wext-common.c +9
-0+int wext_ioctl (unsigned int cmd,struct ifreq *ifr,void __user *arg) +{ +int ret = -EINVAL ; + +/* If command is `set a parameter', or `get the encoding parameters', +* check if the user is allowed to do it */ +if (IW_IS_SET (cmd) || cmd ==SIOCGIWENCODE || cmd ==SIOCGIWENCODEEXT ) +if (!capable (CAP_NET_ADMIN )) +return -EPERM ;
net/wireless/wext-common.c void wireless_send_event(struct net_devi · line 640
Quoted 10 lines
net/wireless/wext-common.c +10
-0+ +dev_load (ifr->ifr_name); + +#ifdef CONFIG_WIRELESS_EXT +rtnl_lock (); +/* Follow me in wext-old.c */ + ret =wireless_process_ioctl (ifr, cmd); +rtnl_unlock (); + + if (ret == 0 && IW_IS_GET(cmd) &&
^^^^^^^^^^^^
That's the bug. That test must be removed.
johannes
[email protected]
maintainerPATCH 2/5 wext: clean up
In reply to [email protected]This cleans up wext.
--- net/wireless/wext-old.c | 302 ++---------------------------------------------- 1 file changed, 17 insertions(+), 285 deletions(-)
net/wireless/wext-old.c +17 -285
@@ -7,79 +7,6 @@* (As all part of the Linux kernel, this file is GPL) */ -/************************** DOCUMENTATION **************************/ -/* -* API definition : -* -------------- -* See <linux/wireless.h> for details of the APIs and the rest. -* -* History : -* ------- -* -* v1 - 5.12.01 - Jean II -* o Created this file. -* -* v2 - 13.12.01 - Jean II -* o Move /proc/net/wireless stuff from net/core/dev.c to here -* o Make Wireless Extension IOCTLs go through here -* o Added iw_handler handling ;-) -* o Added standard ioctl description -* o Initial dumb commit strategy based on orinoco.c -* -* v3 - 19.12.01 - Jean II -* o Make sure we don't go out of standard_ioctl[] in ioctl_standard_call -* o Add event dispatcher function -* o Add event description -* o Propagate events as rtnetlink IFLA_WIRELESS option -* o Generate event on selected SET requests -* -* v4 - 18.04.02 - Jean II -* o Fix stupid off by one in iw_ioctl_description : IW_ESSID_MAX_SIZE + 1 -* -* v5 - 21.06.02 - Jean II -* o Add IW_PRIV_TYPE_ADDR in priv_type_size (+cleanup) -* o Reshuffle IW_HEADER_TYPE_XXX to map IW_PRIV_TYPE_XXX changes -* o Add IWEVCUSTOM for driver specific event/scanning token -* o Turn on WE_STRICT_WRITE by default + kernel warning -* o Fix WE_STRICT_WRITE in ioctl_export_private() (32 => iw_num) -* o Fix off-by-one in test (extra_size <= IFNAMSIZ) -* -* v6 - 9.01.03 - Jean II -* o Add common spy support : iw_handler_set_spy(), wireless_spy_update() -* o Add enhanced spy support : iw_handler_set_thrspy() and event. -* o Add WIRELESS_EXT version display in /proc/net/wireless -* -* v6 - 18.06.04 - Jean II -* o Change get_spydata() method for added safety -* o Remove spy #ifdef, they are always on -> cleaner code -* o Allow any size GET request if user specifies length > max -* and if request has IW_DESCR_FLAG_NOMAX flag or is SIOCGIWPRIV -* o Start migrating get_wireless_stats to struct iw_handler_def -* o Add wmb() in iw_handler_set_spy() for non-coherent archs/cpus -* Based on patch from Pavel Roskin <[email protected]> : -* o Fix kernel data leak to user space in private handler handling -* -* v7 - 18.3.05 - Jean II -* o Remove (struct iw_point *)->pointer from events and streams -* o Remove spy_offset from struct iw_handler_def -* o Start deprecating dev->get_wireless_stats, output a warning -* o If IW_QUAL_DBM is set, show dBm values in /proc/net/wireless -* o Don't loose INVALID/DBM flags when clearing UPDATED flags (iwstats) -* -* v8 - 17.02.06 - Jean II -* o RtNetlink requests support (SET/GET) -* -* v8b - 03.08.06 - Herbert Xu -* o Fix Wireless Event locking issues. -* -* v9 - 14.3.06 - Jean II -* o Change length in ESSID and NICK to strlen() instead of strlen()+1 -* o Make standard_ioctl_num and standard_event_num unsigned -* o Remove (struct net_device *)->get_wireless_stats() -*/ - -/***************************** INCLUDES *****************************/ -#include <linux/module.h> #include <linux/types.h> /* off_t */ #include <linux/netdevice.h> /* struct ifreq, dev_get_by_name() */
@@ -97,19 +24,6 @@#include "wext.h" -/**************************** CONSTANTS ****************************/ - -/* Debugging stuff */ -#undef WE_IOCTL_DEBUG/* Debug IOCTL API */ -#undef WE_RTNETLINK_DEBUG/* Debug RtNetlink API */ -#undef WE_EVENT_DEBUG/* Debug Event dispatcher */ -#undef WE_SPY_DEBUG/* Debug enhanced spy support */ - -/* Options */ -//CONFIG_NET_WIRELESS_RTNETLINK /* Wireless requests over RtNetlink */ -#define WE_EVENT_RTNETLINK /* Propagate events using RtNetlink */ -#define WE_SET_EVENT /* Generate an event on some set commands */ -/************************* GLOBAL VARIABLES *************************/ /* Size (in bytes) of the various private data types */
@@ -313,12 +227,6 @@ static int ioctl_standard_call(struct nereturn -EOPNOTSUPP ; descr = &(wext_standard_ioctl[cmd -SIOCIWFIRST ]); -#ifdef WE_IOCTL_DEBUG -printk (KERN_DEBUG "%s (WE) : Found standard handler for 0x%04X\n" , - ifr->ifr_name, cmd); -printk (KERN_DEBUG "%s (WE) : Header type : %d, Token type : %d, size : %d, token : %d\n" , dev->name, descr->header_type, descr->token_type, descr->token_size, descr->max_tokens); -#endif /* WE_IOCTL_DEBUG */ -/* Prepare the call */ info.cmd = cmd; info.flags =0 ;
@@ -329,12 +237,10 @@ static int ioctl_standard_call(struct ne/* No extra arguments. Trivial to handle */ ret =handler (dev, &info, &(iwr->u),NULL ); -#ifdef WE_SET_EVENT /* Generate an event to notify listeners of the change */ if ((descr->flags &IW_DESCR_FLAG_EVENT ) && ((ret ==0 ) || (ret == -EIWCOMMIT )))wireless_send_event (dev, cmd, &(iwr->u),NULL ); -#endif /* WE_SET_EVENT */ }else {char * extra;int extra_size;
@@ -409,11 +315,6 @@ static int ioctl_standard_call(struct ne } } -#ifdef WE_IOCTL_DEBUG -printk (KERN_DEBUG "%s (WE) : Malloc %d bytes\n" , - dev->name, extra_size); -#endif /* WE_IOCTL_DEBUG */ -/* Create the kernel buffer */ /* kzalloc ensures NULL-termination for essid_compat */ extra =kzalloc (extra_size,GFP_KERNEL );
@@ -430,11 +331,6 @@ static int ioctl_standard_call(struct nekfree (extra);return -EFAULT ; } -#ifdef WE_IOCTL_DEBUG -printk (KERN_DEBUG "%s (WE) : Got %d bytes\n" , - dev->name, - iwr->u.data.length * descr->token_size); -#endif /* WE_IOCTL_DEBUG */ }/* Call the handler */
@@ -454,15 +350,9 @@ static int ioctl_standard_call(struct ne iwr->u.data.length * descr->token_size);if (err) - ret = -EFAULT ; -#ifdef WE_IOCTL_DEBUG -printk (KERN_DEBUG "%s (WE) : Wrote %d bytes\n" , - dev->name, - iwr->u.data.length * descr->token_size); -#endif /* WE_IOCTL_DEBUG */ + ret = -EFAULT ; } -#ifdef WE_SET_EVENT /* Generate an event to notify listeners of the change */ if ((descr->flags &IW_DESCR_FLAG_EVENT ) && ((ret ==0 ) || (ret == -EIWCOMMIT ))) {
@@ -474,7 +364,6 @@ static int ioctl_standard_call(struct newireless_send_event (dev, cmd, &(iwr->u), extra); } -#endif /* WE_SET_EVENT */ /* Cleanup - I told you it wasn't that long ;-) */ kfree (extra);
@@ -524,16 +413,6 @@ static inline int ioctl_private_call(strbreak ; } -#ifdef WE_IOCTL_DEBUG -printk (KERN_DEBUG "%s (WE) : Found private handler for 0x%04X\n" , - ifr->ifr_name, cmd); -if (descr) { -printk (KERN_DEBUG "%s (WE) : Name %s, set %X, get %X\n" , - dev->name, descr->name, - descr->set_args, descr->get_args); - } -#endif /* WE_IOCTL_DEBUG */ -/* Compute the size of the set/get arguments */ if (descr !=NULL ) {if (IW_IS_SET (cmd)) {
@@ -590,11 +469,6 @@ static inline int ioctl_private_call(strreturn -EFAULT ; } -#ifdef WE_IOCTL_DEBUG -printk (KERN_DEBUG "%s (WE) : Malloc %d bytes\n" , - dev->name, extra_size); -#endif /* WE_IOCTL_DEBUG */ -/* Always allocate for max space. Easier, and won't last * long... */ extra =kmalloc (extra_size,GFP_KERNEL );
@@ -610,10 +484,6 @@ static inline int ioctl_private_call(strkfree (extra);return -EFAULT ; } -#ifdef WE_IOCTL_DEBUG -printk (KERN_DEBUG "%s (WE) : Got %d elem\n" , - dev->name, iwr->u.data.length); -#endif /* WE_IOCTL_DEBUG */ }/* Call the handler */
@@ -632,11 +502,7 @@ static inline int ioctl_private_call(str err =copy_to_user (iwr->u.data.pointer, extra, extra_size);if (err) - ret = -EFAULT ; -#ifdef WE_IOCTL_DEBUG -printk (KERN_DEBUG "%s (WE) : Wrote %d elem\n" , - dev->name, iwr->u.data.length); -#endif /* WE_IOCTL_DEBUG */ + ret = -EFAULT ; }/* Cleanup - I told you it wasn't that long ;-) */
@@ -672,8 +538,7 @@ int wireless_process_ioctl(struct ifreq/* A bunch of special cases, then the generic case... * Note that 'cmd' is already filtered in dev_ioctl() with * (cmd >= SIOCIWFIRST && cmd <= SIOCIWLAST) */ -switch (cmd) - { +switch (cmd) {case SIOCGIWSTATS :/* Get Wireless Stats */ return ioctl_standard_call(dev,
@@ -774,22 +639,10 @@ static int rtnetlink_standard_get(structreturn -EOPNOTSUPP ; descr = &(wext_standard_ioctl[cmd -SIOCIWFIRST ]); -#ifdef WE_RTNETLINK_DEBUG -printk (KERN_DEBUG "%s (WE.r) : Found standard handler for 0x%04X\n" , - dev->name, cmd); -printk (KERN_DEBUG "%s (WE.r) : Header type : %d, Token type : %d, size : %d, token : %d\n" , dev->name, descr->header_type, descr->token_type, descr->token_size, descr->max_tokens); -#endif /* WE_RTNETLINK_DEBUG */ -/* Check if wrqu is complete */ hdr_len = event_type_size[descr->header_type]; -if (request_len < hdr_len) { -#ifdef WE_RTNETLINK_DEBUG -printk (KERN_DEBUG -"%s (WE.r) : Wireless request too short (%d)\n" , - dev->name, request_len); -#endif /* WE_RTNETLINK_DEBUG */ +if (request_len < hdr_len)return -EINVAL ; - }/* Prepare the call */ info.cmd = cmd;
@@ -833,10 +686,6 @@ static int rtnetlink_standard_get(struct extra_size = (wrqu_point.data.length * descr->token_size); buffer_size = extra_size +IW_EV_POINT_LEN +IW_EV_POINT_OFF ; -#ifdef WE_RTNETLINK_DEBUG -printk (KERN_DEBUG "%s (WE.r) : Malloc %d bytes (%d bytes)\n" , - dev->name, extra_size, buffer_size); -#endif /* WE_RTNETLINK_DEBUG */ /* Create the kernel buffer that we will return */ buffer =kmalloc (buffer_size,GFP_KERNEL );
@@ -868,10 +717,6 @@ static int rtnetlink_standard_get(struct* dummy pointer. */ memcpy (buffer +IW_EV_POINT_OFF , request,IW_EV_LCP_LEN ); -#ifdef WE_RTNETLINK_DEBUG -printk (KERN_DEBUG "%s (WE.r) : Reply 0x%04X, hdr_len %d, tokens %d, extra_size %d, buffer_size %d\n" , dev->name, cmd, hdr_len, wrqu->data.length, extra_size, buffer_size); -#endif /* WE_RTNETLINK_DEBUG */ -/* Check if there is enough buffer up there */ if (wrqu_point.data.length < wrqu->data.length) ret = -E2BIG ;
@@ -916,25 +761,13 @@ static inline int rtnetlink_standard_setreturn -EOPNOTSUPP ; descr = &(wext_standard_ioctl[cmd -SIOCIWFIRST ]); -#ifdef WE_RTNETLINK_DEBUG -printk (KERN_DEBUG "%s (WE.r) : Found standard SET handler for 0x%04X\n" , - dev->name, cmd); -printk (KERN_DEBUG "%s (WE.r) : Header type : %d, Token type : %d, size : %d, token : %d\n" , dev->name, descr->header_type, descr->token_type, descr->token_size, descr->max_tokens); -#endif /* WE_RTNETLINK_DEBUG */ -/* Extract fixed header from request. This is properly aligned. */ wrqu = &request->u;/* Check if wrqu is complete */ hdr_len = event_type_size[descr->header_type]; -if (request_len < hdr_len) { -#ifdef WE_RTNETLINK_DEBUG -printk (KERN_DEBUG -"%s (WE.r) : Wireless request too short (%d)\n" , - dev->name, request_len); -#endif /* WE_RTNETLINK_DEBUG */ +if (request_len < hdr_len)return -EINVAL ; - }/* Prepare the call */ info.cmd = cmd;
@@ -965,18 +798,8 @@ static inline int rtnetlink_standard_set extra_len = wrqu_point.data.length * descr->token_size;/* Check if request is self consistent */ -if ((request_len - hdr_len) < extra_len) { -#ifdef WE_RTNETLINK_DEBUG -printk (KERN_DEBUG "%s (WE.r) : Wireless request data too short (%d)\n" , - dev->name, extra_size); -#endif /* WE_RTNETLINK_DEBUG */ +if ((request_len - hdr_len) < extra_len)return -EINVAL ; - } - -#ifdef WE_RTNETLINK_DEBUG -printk (KERN_DEBUG "%s (WE.r) : Malloc %d bytes\n" , - dev->name, extra_size); -#endif /* WE_RTNETLINK_DEBUG */ /* Always allocate for max space. Easier, and won't last * long... */
@@ -992,7 +815,6 @@ static inline int rtnetlink_standard_set ret =handler (dev, &info, &wrqu_point, extra); } -#ifdef WE_SET_EVENT /* Generate an event to notify listeners of the change */ if ((descr->flags &IW_DESCR_FLAG_EVENT ) && ((ret ==0 ) || (ret == -EIWCOMMIT ))) {
@@ -1003,7 +825,6 @@ static inline int rtnetlink_standard_setelse wireless_send_event (dev, cmd, wrqu, extra); } -#endif /* WE_SET_EVENT */ /* Cleanup - I told you it wasn't that long ;-) */ if (extra)
@@ -1059,13 +880,6 @@ static inline int rtnetlink_private_get(if (descr ==NULL )return -EOPNOTSUPP ; -#ifdef WE_RTNETLINK_DEBUG -printk (KERN_DEBUG "%s (WE.r) : Found private handler for 0x%04X\n" , - dev->name, cmd); -printk (KERN_DEBUG "%s (WE.r) : Name %s, set %X, get %X\n" , - dev->name, descr->name, descr->set_args, descr->get_args); -#endif /* WE_RTNETLINK_DEBUG */ -/* Compute the max size of the get arguments */ extra_size =get_priv_size (descr->get_args);
@@ -1079,14 +893,8 @@ static inline int rtnetlink_private_get( }/* Check if wrqu is complete */ -if (request_len < hdr_len) { -#ifdef WE_RTNETLINK_DEBUG -printk (KERN_DEBUG -"%s (WE.r) : Wireless request too short (%d)\n" , - dev->name, request_len); -#endif /* WE_RTNETLINK_DEBUG */ +if (request_len < hdr_len)return -EINVAL ; - }/* Prepare the call */ info.cmd = cmd;
@@ -1117,11 +925,6 @@ static inline int rtnetlink_private_get(/* Buffer for full reply */ buffer_size = extra_size +IW_EV_POINT_LEN +IW_EV_POINT_OFF ; -#ifdef WE_RTNETLINK_DEBUG -printk (KERN_DEBUG "%s (WE.r) : Malloc %d bytes (%d bytes)\n" , - dev->name, extra_size, buffer_size); -#endif /* WE_RTNETLINK_DEBUG */ -/* Create the kernel buffer that we will return */ buffer =kmalloc (buffer_size,GFP_KERNEL );if (buffer ==NULL ) {
@@ -1153,10 +956,6 @@ static inline int rtnetlink_private_get(/* Put the iwe header where it should, i.e. scrap the * dummy pointer. */ memcpy (buffer +IW_EV_POINT_OFF , request,IW_EV_LCP_LEN ); - -#ifdef WE_RTNETLINK_DEBUG -printk (KERN_DEBUG "%s (WE.r) : Reply 0x%04X, hdr_len %d, tokens %d, extra_size %d, buffer_size %d\n" , dev->name, cmd, hdr_len, wrqu->data.length, extra_size, buffer_size); -#endif /* WE_RTNETLINK_DEBUG */ }/* Return the buffer to the caller */
@@ -1214,13 +1013,6 @@ static inline int rtnetlink_private_set(if (descr ==NULL )return -EOPNOTSUPP ; -#ifdef WE_RTNETLINK_DEBUG -printk (KERN_DEBUG "%s (WE.r) : Found private handler for 0x%04X\n" , - ifr->ifr_name, cmd); -printk (KERN_DEBUG "%s (WE.r) : Name %s, set %X, get %X\n" , - dev->name, descr->name, descr->set_args, descr->get_args); -#endif /* WE_RTNETLINK_DEBUG */ -/* Compute the size of the set arguments */ /* Check for sub-ioctl handler */ if (descr->name[0 ] =='\0' )
@@ -1243,14 +1035,8 @@ static inline int rtnetlink_private_set( wrqu = &request->u;/* Check if wrqu is complete */ -if (request_len < hdr_len) { -#ifdef WE_RTNETLINK_DEBUG -printk (KERN_DEBUG -"%s (WE.r) : Wireless request too short (%d)\n" , - dev->name, request_len); -#endif /* WE_RTNETLINK_DEBUG */ +if (request_len < hdr_len)return -EINVAL ; - }/* Prepare the call */ info.cmd = cmd;
@@ -1278,18 +1064,8 @@ static inline int rtnetlink_private_set( extra_len =adjust_priv_size (descr->set_args, &wrqu_point);/* Check if request is self consistent */ -if ((request_len - hdr_len) < extra_len) { -#ifdef WE_RTNETLINK_DEBUG -printk (KERN_DEBUG "%s (WE.r) : Wireless request data too short (%d)\n" , - dev->name, extra_size); -#endif /* WE_RTNETLINK_DEBUG */ +if ((request_len - hdr_len) < extra_len)return -EINVAL ; - } - -#ifdef WE_RTNETLINK_DEBUG -printk (KERN_DEBUG "%s (WE.r) : Malloc %d bytes\n" , - dev->name, extra_size); -#endif /* WE_RTNETLINK_DEBUG */ /* Always allocate for max space. Easier, and won't last * long... */
@@ -1330,18 +1106,12 @@ int wireless_rtnetlink_get(struct net_deiw_handler handler;/* Check length */ -if (len <IW_EV_LCP_LEN ) { -printk (KERN_DEBUG "%s (WE.r) : RtNetlink request too short (%d)\n" , - dev->name, len); +if (len <IW_EV_LCP_LEN )return -EINVAL ; - }/* ReCheck length (len may have padding) */ -if (request->len > len) { -printk (KERN_DEBUG "%s (WE.r) : RtNetlink request len invalid (%d-%d)\n" , - dev->name, request->len, len); +if (request->len > len)return -EINVAL ; - }/* Only accept GET requests in here */ if (!IW_IS_GET (request->cmd))
@@ -1414,18 +1184,12 @@ int wireless_rtnetlink_set(struct net_deiw_handler handler;/* Check length */ -if (len <IW_EV_LCP_LEN ) { -printk (KERN_DEBUG "%s (WE.r) : RtNetlink request too short (%d)\n" , - dev->name, len); +if (len <IW_EV_LCP_LEN )return -EINVAL ; - }/* ReCheck length (len may have padding) */ -if (request->len > len) { -printk (KERN_DEBUG "%s (WE.r) : RtNetlink request len invalid (%d-%d)\n" , - dev->name, request->len, len); +if (request->len > len)return -EINVAL ; - }/* Only accept SET requests in here */ if (!IW_IS_SET (request->cmd))
@@ -1521,19 +1285,6 @@ int iw_handler_set_spy(struct net_device/* Reset stats */ memset (spydata->spy_stat,0 ,sizeof (struct iw_quality ) *IW_MAX_SPY ); - -#ifdef WE_SPY_DEBUG -printk (KERN_DEBUG "iw_handler_set_spy() : wireless_data %p, spydata %p, num %d\n" , dev->wireless_data, spydata, wrqu->data.length); -for (i =0 ; i < wrqu->data.length; i++) -printk (KERN_DEBUG -"%02X:%02X:%02X:%02X:%02X:%02X \n" , - spydata->spy_address[i][0 ], - spydata->spy_address[i][1 ], - spydata->spy_address[i][2 ], - spydata->spy_address[i][3 ], - spydata->spy_address[i][4 ], - spydata->spy_address[i][5 ]); -#endif /* WE_SPY_DEBUG */ }/* Make sure above is updated before re-enabling */
@@ -1544,6 +1295,7 @@ int iw_handler_set_spy(struct net_devicereturn 0 ; } +EXPORT_SYMBOL (iw_handler_set_spy);/*------------------------------------------------------------------*/ /*
@@ -1579,6 +1331,7 @@ int iw_handler_get_spy(struct net_device spydata->spy_stat[i].updated &= ~IW_QUAL_ALL_UPDATED ;return 0 ; } +EXPORT_SYMBOL (iw_handler_get_spy);/*------------------------------------------------------------------*/ /*
@@ -1603,12 +1356,9 @@ int iw_handler_set_thrspy(struct net_dev/* Clear flag */ memset (spydata->spy_thr_under,'\0' ,sizeof (spydata->spy_thr_under)); -#ifdef WE_SPY_DEBUG -printk (KERN_DEBUG "iw_handler_set_thrspy() : low %d ; high %d\n" , spydata->spy_thr_low.level, spydata->spy_thr_high.level); -#endif /* WE_SPY_DEBUG */ -return 0 ; } +EXPORT_SYMBOL (iw_handler_set_thrspy);/*------------------------------------------------------------------*/ /*
@@ -1632,6 +1382,7 @@ int iw_handler_get_thrspy(struct net_devreturn 0 ; } +EXPORT_SYMBOL (iw_handler_get_thrspy);/*------------------------------------------------------------------*/ /*
@@ -1657,16 +1408,6 @@ static void iw_send_thrspy_event(structmemcpy (&(threshold.low), &(spydata->spy_thr_low),2 *sizeof (struct iw_quality )); -#ifdef WE_SPY_DEBUG -printk (KERN_DEBUG "iw_send_thrspy_event() : address %02X:%02X:%02X:%02X:%02X:%02X, level %d, up = %d\n" , - threshold.addr.sa_data[0 ], - threshold.addr.sa_data[1 ], - threshold.addr.sa_data[2 ], - threshold.addr.sa_data[3 ], - threshold.addr.sa_data[4 ], - threshold.addr.sa_data[5 ], threshold.qual.level); -#endif /* WE_SPY_DEBUG */ -/* Send event to user space */ wireless_send_event (dev,SIOCGIWTHRSPY , &wrqu, (char *) &threshold); }
@@ -1690,10 +1431,6 @@ void wireless_spy_update(struct net_deviif (!spydata)return ; -#ifdef WE_SPY_DEBUG -printk (KERN_DEBUG "wireless_spy_update() : wireless_data %p, spydata %p, address %02X:%02X:%02X:%02X:%02X:%02X\n" , dev->wireless_data, spydata, address[0 ], address[1 ], address[2 ], address[3 ], address[4 ], address[5 ]); -#endif /* WE_SPY_DEBUG */ -/* Update all records that match */ for (i =0 ; i < spydata->spy_number; i++)if (!compare_ether_addr (address, spydata->spy_address[i])) {
@@ -1722,9 +1459,4 @@ void wireless_spy_update(struct net_devi } } } - -EXPORT_SYMBOL (iw_handler_get_spy); -EXPORT_SYMBOL (iw_handler_get_thrspy); -EXPORT_SYMBOL (iw_handler_set_spy); -EXPORT_SYMBOL (iw_handler_set_thrspy);EXPORT_SYMBOL (wireless_spy_update);
--
[email protected]
maintainerPATCH 3/5 d80211: update for wiphy api
In reply to [email protected]This patch lets d80211 use the new wiphy stuff from cfg80211.
Patch is large because cfg80211 requires the net_dev->ieee80211_ptr now.
--- include/net/d80211.h | 24 ++++- net/d80211/Kconfig | 1 net/d80211/Makefile | 2 net/d80211/ieee80211.c | 150 ++++++++++++++++-------------------- net/d80211/ieee80211_cfg.c | 32 +++++++ net/d80211/ieee80211_cfg.h | 9 ++ net/d80211/ieee80211_dev.c | 117 ---------------------------- net/d80211/ieee80211_i.h | 22 ----- net/d80211/ieee80211_iface.c | 27 +++--- net/d80211/ieee80211_ioctl.c | 104 ++++++++++++------------- net/d80211/ieee80211_led.c | 4 net/d80211/ieee80211_sta.c | 56 ++++++------- net/d80211/ieee80211_sysfs.c | 162 +++++++++++---------------------------- net/d80211/ieee80211_sysfs.h | 12 ++ net/d80211/ieee80211_sysfs_sta.c | 4 net/d80211/rc80211_simple.c | 4 net/d80211/wme.c | 26 +++--- 17 files changed, 301 insertions(+), 455 deletions(-)
include/net/d80211.h +17 -7
@@ -16,6 +16,7 @@#include <linux/wireless.h> #include <linux/device.h> #include <linux/ieee80211.h> +#include <net/cfg80211.h> /* Note! Only ieee80211_tx_status_irqsafe() and ieee80211_rx_irqsafe() can be * called in hardware interrupt context. The low-level driver must not call any
@@ -454,8 +455,12 @@ typedef enum {/* This is driver-visible part of the per-hw state the stack keeps. */ struct ieee80211_hw { -/* these are assigned by d80211, don't write */ -int index; +/* points to the cfg80211 wiphy for this piece. Note +* that you must fill in the perm_addr and dev fields +* of this structure, use the macros provided below. */ +struct wiphy *wiphy; + +/* assigned by d80211, don't write */ struct ieee80211_conf conf;/* Pointer to the private area that was
@@ -464,11 +469,6 @@ struct ieee80211_hw {/* The rest is information about your hardware */ -struct device *dev; - -/* permanent mac address */ -u8 perm_addr[ETH_ALEN ]; -/* TODO: frame_type 802.11/802.3, sw_encryption requirements */ /* Some wireless LAN chipsets generate beacons in the hardware/firmware
@@ -547,6 +547,16 @@ struct ieee80211_hw {int queues; }; +static inline void SET_IEEE80211_DEV (struct ieee80211_hw *hw,struct device *dev) +{ + hw->wiphy->dev = dev; +} + +static inline void SET_IEEE80211_PERM_ADDR (struct ieee80211_hw *hw,u8 *addr) +{ +memcpy (hw->wiphy->perm_addr, addr,ETH_ALEN ); +} +/* Configuration block used by the low-level driver to tell the 802.11 code * about supported hardware features and to pass function pointers to callback * functions. */
net/d80211/ieee80211.c +69 -81
364 lines not on this page · raw message
net/d80211/Makefile +1 -1
@@ -10,7 +10,6 @@ obj-$(CONFIG_D80211) += 80211.o rc80211_ wpa.o \ ieee80211_scan.o \ ieee80211_sta.o \ - ieee80211_dev.o \ ieee80211_iface.o \ ieee80211_rate.o \ ieee80211_sysfs.o \
@@ -19,6 +18,7 @@ obj-$(CONFIG_D80211) += 80211.o rc80211_ tkip.o \ aes_ccm.o \ wme.o \ + ieee80211_cfg.o \ $(80211-objs-y) ifeq ($(CONFIG_NET_SCHED),)
net/d80211/ieee80211_dev.c deleted +0 -117
117 lines not on this page · raw message
net/d80211/ieee80211_iface.c +14 -13
@@ -14,6 +14,7 @@#include <net/d80211.h> #include "ieee80211_i.h" #include "sta_info.h" +#include "ieee80211_sysfs.h" void ieee80211_if_sdata_init (struct ieee80211_sub_if_data *sdata) {
@@ -40,7 +41,7 @@ int ieee80211_if_add(struct net_device * int format, struct net_device **new_dev) { struct net_device *ndev, *tmp_dev; -struct ieee80211_local *local = dev->ieee80211_ptr; +struct ieee80211_local *local =wiphy_priv (dev->ieee80211_ptr);struct ieee80211_sub_if_data *sdata =NULL ;int ret;int i;
@@ -51,7 +52,7 @@ int ieee80211_if_add(struct net_device *if (!ndev)return -ENOMEM ; - ndev->ieee80211_ptr = local; + ndev->ieee80211_ptr = local->hw.wiphy;if (strlen (name) ==0 ) { i =0 ; do {
@@ -70,13 +71,13 @@ int ieee80211_if_add(struct net_device *snprintf (ndev->name,IFNAMSIZ ,"%s" , name); } -memcpy (ndev->dev_addr, local->hw.perm_addr,ETH_ALEN ); +memcpy (ndev->dev_addr, local->hw.wiphy->perm_addr,ETH_ALEN ); ndev->base_addr = dev->base_addr; ndev->irq = dev->irq; ndev->mem_start = dev->mem_start; ndev->mem_end = dev->mem_end; ndev->flags = dev->flags &IFF_MULTICAST ; -SET_NETDEV_DEV (ndev, local->hw.dev); +SET_NETDEV_DEV (ndev, local->hw.wiphy->dev); sdata =IEEE80211_DEV_TO_SUB_IF (ndev); sdata->type =IEEE80211_IF_TYPE_AP ;
@@ -122,9 +123,9 @@ int ieee80211_if_add_mgmt(struct ieee802if (ret <0 ) goto fail; - ndev->ieee80211_ptr = local; -memcpy (ndev->dev_addr, local->hw.perm_addr,ETH_ALEN ); -SET_NETDEV_DEV (ndev, local->hw.dev); + ndev->ieee80211_ptr = local->hw.wiphy; +memcpy (ndev->dev_addr, local->hw.wiphy->perm_addr,ETH_ALEN ); +SET_NETDEV_DEV (ndev, local->hw.wiphy->dev); nsdata =IEEE80211_DEV_TO_SUB_IF (ndev); nsdata->type =IEEE80211_IF_TYPE_MGMT ;
@@ -164,7 +165,7 @@ void ieee80211_if_del_mgmt(struct ieee80void ieee80211_if_set_type (struct net_device *dev,int type) {struct ieee80211_sub_if_data *sdata =IEEE80211_DEV_TO_SUB_IF (dev); -struct ieee80211_local *local = dev->ieee80211_ptr; +struct ieee80211_local *local =wiphy_priv (dev->ieee80211_ptr); sdata->type = type;switch (type) {
@@ -212,7 +213,7 @@ void ieee80211_if_set_type(struct net_de/* Must be called with rtnl lock held. */ void ieee80211_if_reinit (struct net_device *dev) { -struct ieee80211_local *local = dev->ieee80211_ptr; +struct ieee80211_local *local =wiphy_priv (dev->ieee80211_ptr);struct ieee80211_sub_if_data *sdata =IEEE80211_DEV_TO_SUB_IF (dev);struct sta_info *sta;int i;
@@ -318,7 +319,7 @@ void __ieee80211_if_del(struct ieee80211/* Must be called with rtnl lock held. */ int ieee80211_if_remove (struct net_device *dev,const char *name,int id) { -struct ieee80211_local *local = dev->ieee80211_ptr; +struct ieee80211_local *local =wiphy_priv (dev->ieee80211_ptr);struct ieee80211_sub_if_data *sdata, *n;ASSERT_RTNL ();
@@ -337,7 +338,7 @@ int ieee80211_if_remove(struct net_devicvoid ieee80211_if_free (struct net_device *dev) { -struct ieee80211_local *local = dev->ieee80211_ptr; +struct ieee80211_local *local =wiphy_priv (dev->ieee80211_ptr);struct ieee80211_sub_if_data *sdata =IEEE80211_DEV_TO_SUB_IF (dev);/* local->apdev must be NULL when freeing management interface */
@@ -349,7 +350,7 @@ void ieee80211_if_free(struct net_device/* Must be called with rtnl lock held. */ void ieee80211_if_flush (struct net_device *dev) { -struct ieee80211_local *local = dev->ieee80211_ptr; +struct ieee80211_local *local =wiphy_priv (dev->ieee80211_ptr);struct ieee80211_sub_if_data *sdata, *n;ASSERT_RTNL ();
@@ -360,7 +361,7 @@ void ieee80211_if_flush(struct net_devicvoid ieee80211_if_del (struct net_device *dev) { -struct ieee80211_local *local = dev->ieee80211_ptr; +struct ieee80211_local *local =wiphy_priv (dev->ieee80211_ptr);struct ieee80211_sub_if_data *sdata =IEEE80211_DEV_TO_SUB_IF (dev);rtnl_lock ();
net/d80211/ieee80211_i.h +0 -22
@@ -344,8 +344,6 @@ struct ieee80211_local {int monitors;struct iw_statistics wstats; -struct class_device class_dev; -enum {IEEE80211_DEV_UNITIALIZED =0 ,IEEE80211_DEV_REGISTERED ,
@@ -596,7 +594,6 @@ static inline void bss_tim_clear(struct }/* ieee80211.c */ -void ieee80211_release_hw (struct ieee80211_local *local);int ieee80211_hw_config (struct ieee80211_local *local);int ieee80211_if_config (struct net_device *dev);int ieee80211_if_config_beacon (struct net_device *dev);
@@ -680,14 +677,6 @@ struct sta_info * ieee80211_ibss_add_staint ieee80211_sta_deauthenticate (struct net_device *dev,u16 reason);int ieee80211_sta_disassociate (struct net_device *dev,u16 reason); -/* ieee80211_dev.c */ -int ieee80211_dev_alloc_index (struct ieee80211_local *local); -void ieee80211_dev_free_index (struct ieee80211_local *local); -struct ieee80211_local *ieee80211_dev_find (int index); -int ieee80211_dev_find_index (struct ieee80211_local *local); -struct ieee80211_local *ieee80211_dev_alloc (gfp_t flags); -void ieee80211_dev_free (struct ieee80211_local *local); -/* ieee80211_iface.c */ int ieee80211_if_add (struct net_device *dev,const char *name,int format,struct net_device **new_dev);
@@ -703,17 +692,6 @@ void ieee80211_if_sdata_init(struct ieeeint ieee80211_if_add_mgmt (struct ieee80211_local *local);void ieee80211_if_del_mgmt (struct ieee80211_local *local); -/* ieee80211_sysfs.c */ -int ieee80211_sysfs_add_netdevice (struct net_device *dev); -void ieee80211_sysfs_remove_netdevice (struct net_device *dev); -void ieee80211_dev_sysfs_init (struct ieee80211_local *local); -void ieee80211_dev_sysfs_put (struct ieee80211_local *local); -int ieee80211_dev_sysfs_add (struct ieee80211_local *local); -void ieee80211_dev_sysfs_del (struct ieee80211_local *local); -int ieee80211_sysfs_init (void ); -void ieee80211_sysfs_deinit (void ); -int ieee80211_sysfs_change_if_type (struct net_device *dev); -/* ieee80211_sysfs_sta.c */ int ieee80211_sta_kset_sysfs_register (struct ieee80211_local *local);void ieee80211_sta_kset_sysfs_unregister (struct ieee80211_local *local);
net/d80211/ieee80211_led.c +2 -2
@@ -39,7 +39,7 @@ void ieee80211_led_init(struct ieee80211if (!local->rx_led)return ;snprintf (local->rx_led_name,sizeof (local->rx_led_name), -"wiphy%drx" , local->hw.index); +"wiphy%drx" , local->hw.wiphy->wiphy_index); local->rx_led->name = local->rx_led_name;if (led_trigger_register (local->rx_led)) {kfree (local->rx_led);
@@ -50,7 +50,7 @@ void ieee80211_led_init(struct ieee80211if (!local->tx_led)return ;snprintf (local->tx_led_name,sizeof (local->tx_led_name), -"wiphy%dtx" , local->hw.index); +"wiphy%dtx" , local->hw.wiphy->wiphy_index); local->tx_led->name = local->tx_led_name;if (led_trigger_register (local->tx_led)) {kfree (local->tx_led);
net/d80211/ieee80211_sysfs.c +47 -115
225 lines not on this page · raw message
net/d80211/Kconfig +1 -0
@@ -5,6 +5,7 @@ config D80211 select CRYPTO_ARC4 select CRYPTO_AES select WIRELESS_EXT + select CFG80211 ---help--- This option enables the hardware independent IEEE 802.11 networking stack.
net/d80211/ieee80211_cfg.c new file +32 -0
@@ -0,0 +1,32 @@ +/* +* d80211 configuration hooks for cfg80211 +* +* Copyright 2006 Johannes Berg <[email protected]> +* +* This file is GPLv2 as found in COPYING. +*/ + +#include <net/cfg80211.h> +#include "ieee80211_i.h" +#include "ieee80211_cfg.h" + +static int ieee80211_list_interfaces (struct wiphy *wiphy,void *data, +int (*one)(void *data,int ifindex)) +{ +struct ieee80211_local *local =wiphy_priv (wiphy); +struct ieee80211_sub_if_data *subif; +int err; + +spin_lock_bh (&local->sub_if_lock); +list_for_each_entry (subif, &local->sub_if_list, list) { + err =one (data, subif->dev->ifindex); +if (err) +break ; + } +spin_unlock_bh (&local->sub_if_lock); +return err; +} + +struct cfg80211_ops d80211_config_ops = { + .list_interfaces = ieee80211_list_interfaces, +};
net/d80211/ieee80211_cfg.h new file +9 -0
@@ -0,0 +1,9 @@ +/* +* d80211 configuration hooks for cfg80211 +*/ +#ifndef __IEEE80211_CFG_H +#define __IEEE80211_CFG_H + +extern struct cfg80211_ops d80211_config_ops; + +#endif /* __IEEE80211_CFG_H */
net/d80211/ieee80211_sysfs_sta.c +2 -2
@@ -39,7 +39,7 @@ static ssize_t show_sta_##name(const str#define STA_SHOW_RATE (name, field) \ static ssize_t show_sta_##name(const struct sta_info *sta, char *buf) \ { \ - struct ieee80211_local *local = sta->dev->ieee80211_ptr; \ + struct ieee80211_local *local = wiphy_priv(sta->dev->ieee80211_ptr);\ return sprintf(buf, "%d\n", \ (sta->field >= 0 && \ sta->field < local->num_curr_rates) ? \
@@ -370,7 +370,7 @@ int ieee80211_sta_kset_sysfs_register(st res =kobject_set_name (&local->sta_kset.kobj,"sta" );if (res)return res; - local->sta_kset.kobj.parent = &local->class_dev.kobj; + local->sta_kset.kobj.parent = &local->hw.wiphy->class_dev.kobj; local->sta_kset.ktype = &sta_ktype;return kset_register (&local->sta_kset); }
net/d80211/ieee80211_sysfs.h new file +12 -0
@@ -0,0 +1,12 @@ +/* routines exported for sysfs handling */ + +#ifndef __IEEE80211_SYSFS_H +#define __IEEE80211_SYSFS_H + +int ieee80211_sysfs_add_netdevice (struct net_device *dev); +void ieee80211_sysfs_remove_netdevice (struct net_device *dev); +int ieee80211_sysfs_change_if_type (struct net_device *dev); +int ieee80211_dev_sysfs_add (struct ieee80211_local *local); +void ieee80211_dev_sysfs_del (struct ieee80211_local *local); + +#endif /* __IEEE80211_SYSFS_H */
net/d80211/ieee80211_ioctl.c +52 -52
413 lines not on this page · raw message
net/d80211/ieee80211_sta.c +28 -28
224 lines not on this page · raw message
net/d80211/rc80211_simple.c +2 -2
@@ -124,7 +124,7 @@ static void rate_control_simple_tx_statustruct sk_buff *skb, struct ieee80211_tx_status *status) { - struct ieee80211_local *local = dev->ieee80211_ptr; + struct ieee80211_local *local = wiphy_priv(dev->ieee80211_ptr);struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;struct sta_info *sta;struct sta_rate_control *srctrl;
@@ -216,7 +216,7 @@ rate_control_simple_get_rate(void *priv,struct sk_buff *skb, struct rate_control_extra *extra) { - struct ieee80211_local *local = dev->ieee80211_ptr; + struct ieee80211_local *local = wiphy_priv(dev->ieee80211_ptr);struct ieee80211_sub_if_data *sdata;struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;struct sta_info *sta;
net/d80211/wme.c +13 -13
@@ -160,7 +160,7 @@ static inline int wme_downgrade_ac(struc* negative return value indicates to drop the frame */ static inline int classify80211 (struct sk_buff *skb,struct Qdisc *qd) { -struct ieee80211_local *local = qd->dev->ieee80211_ptr; +struct ieee80211_local *local =wiphy_priv (qd->dev->ieee80211_ptr);struct ieee80211_tx_packet_data *pkt_data = (struct ieee80211_tx_packet_data *) skb->cb;struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
@@ -211,7 +211,7 @@ static inline int classify80211(struct sstatic int wme_qdiscop_enqueue (struct sk_buff *skb,struct Qdisc * qd) { -struct ieee80211_local *local = qd->dev->ieee80211_ptr; +struct ieee80211_local *local =wiphy_priv (qd->dev->ieee80211_ptr);struct ieee80211_sched_data *q =qdisc_priv (qd);struct ieee80211_tx_packet_data *pkt_data = (struct ieee80211_tx_packet_data *) skb->cb;
@@ -298,7 +298,7 @@ static struct sk_buff *wme_qdiscop_deque {struct ieee80211_sched_data *q =qdisc_priv (qd);struct net_device *dev = qd->dev; -struct ieee80211_local *local = dev->ieee80211_ptr; +struct ieee80211_local *local =wiphy_priv (dev->ieee80211_ptr);struct ieee80211_hw *hw = &local->hw;struct sk_buff *skb;struct Qdisc *qdisc;
@@ -334,7 +334,7 @@ static struct sk_buff *wme_qdiscop_dequestatic void wme_qdiscop_reset (struct Qdisc * qd) {struct ieee80211_sched_data *q =qdisc_priv (qd); -struct ieee80211_local *local = qd->dev->ieee80211_ptr; +struct ieee80211_local *local =wiphy_priv (qd->dev->ieee80211_ptr);struct ieee80211_hw *hw = &local->hw;int queue;
@@ -351,7 +351,7 @@ static void wme_qdiscop_reset(struct Qdistatic void wme_qdiscop_destroy (struct Qdisc * qd) {struct ieee80211_sched_data *q =qdisc_priv (qd); -struct ieee80211_local *local = qd->dev->ieee80211_ptr; +struct ieee80211_local *local =wiphy_priv (qd->dev->ieee80211_ptr);struct ieee80211_hw *hw = &local->hw;struct tcf_proto *tp;int queue;
@@ -392,7 +392,7 @@ static int wme_qdiscop_init(struct Qdisc {struct ieee80211_sched_data *q =qdisc_priv (qd);struct net_device *dev = qd->dev; -struct ieee80211_local *local = dev->ieee80211_ptr; +struct ieee80211_local *local =wiphy_priv (dev->ieee80211_ptr);int queues = local->hw.queues;int err =0 , i;
@@ -448,7 +448,7 @@ static int wme_classop_graft(struct Qdis struct Qdisc *new, struct Qdisc **old) { struct ieee80211_sched_data *q = qdisc_priv(qd); -struct ieee80211_local *local = qd->dev->ieee80211_ptr; +struct ieee80211_local *local =wiphy_priv (qd->dev->ieee80211_ptr);struct ieee80211_hw *hw = &local->hw;unsigned long queue = arg -1 ;
@@ -472,7 +472,7 @@ static struct Qdisc * wme_classop_leaf(struct Qdisc *qd, unsigned long arg) {struct ieee80211_sched_data *q =qdisc_priv (qd); -struct ieee80211_local *local = qd->dev->ieee80211_ptr; +struct ieee80211_local *local =wiphy_priv (qd->dev->ieee80211_ptr);struct ieee80211_hw *hw = &local->hw;unsigned long queue = arg -1 ;
@@ -485,7 +485,7 @@ wme_classop_leaf(struct Qdisc *qd, unsigstatic unsigned long wme_classop_get (struct Qdisc *qd,u32 classid) { -struct ieee80211_local *local = qd->dev->ieee80211_ptr; +struct ieee80211_local *local =wiphy_priv (qd->dev->ieee80211_ptr);struct ieee80211_hw *hw = &local->hw;unsigned long queue =TC_H_MIN (classid);
@@ -513,7 +513,7 @@ static int wme_classop_change(struct Qdi struct rtattr **tca, unsigned long *arg) { unsigned long cl = *arg; -struct ieee80211_local *local = qd->dev->ieee80211_ptr; +struct ieee80211_local *local =wiphy_priv (qd->dev->ieee80211_ptr);struct ieee80211_hw *hw = &local->hw;/* printk(KERN_DEBUG "entering %s\n", __func__); */
@@ -531,7 +531,7 @@ static int wme_classop_change(struct Qdi* when we add WMM-SA support - TSPECs may be deleted here */ static int wme_classop_delete (struct Qdisc *qd,unsigned long cl) { -struct ieee80211_local *local = qd->dev->ieee80211_ptr; +struct ieee80211_local *local =wiphy_priv (qd->dev->ieee80211_ptr);struct ieee80211_hw *hw = &local->hw;/* printk(KERN_DEBUG "entering %s\n", __func__); */
@@ -545,7 +545,7 @@ static int wme_classop_dump_class(struct struct sk_buff *skb, struct tcmsg *tcm) { struct ieee80211_sched_data *q = qdisc_priv(qd); -struct ieee80211_local *local = qd->dev->ieee80211_ptr; +struct ieee80211_local *local =wiphy_priv (qd->dev->ieee80211_ptr);struct ieee80211_hw *hw = &local->hw;/* printk(KERN_DEBUG "entering %s\n", __func__); */
@@ -560,7 +560,7 @@ static int wme_classop_dump_class(structstatic void wme_classop_walk (struct Qdisc *qd,struct qdisc_walker *arg) { -struct ieee80211_local *local = qd->dev->ieee80211_ptr; +struct ieee80211_local *local =wiphy_priv (qd->dev->ieee80211_ptr);struct ieee80211_hw *hw = &local->hw;int queue;/* printk(KERN_DEBUG "entering %s\n", __func__); */
--
[email protected]
maintainerPATCH 4/5 zd1211rw-d80211: update for wiphy api
In reply to [email protected]update zd1211rw-d80211.
--- drivers/net/wireless/d80211/zd1211rw/zd_mac.c | 6 +++--- drivers/net/wireless/d80211/zd1211rw/zd_usb.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/wireless/d80211/zd1211rw/zd_mac.c +3 -3
@@ -54,7 +54,7 @@ int zd_mac_init_hw(struct ieee80211_hw * goto disable_int;ZD_ASSERT (!irqs_disabled ());spin_lock_irq (&mac->lock); -memcpy (dev->perm_addr, addr,ETH_ALEN ); +SET_IEEE80211_PERM_ADDR (dev, addr);spin_unlock_irq (&mac->lock); r =zd_read_regdomain (chip, &default_regdomain);
@@ -589,7 +589,7 @@ struct ieee80211_hw *zd_mac_alloc(struct mac->dev = dev; mac->mode =IEEE80211_IF_TYPE_MGMT ; - mac->hwaddr = dev->perm_addr; + mac->hwaddr = dev->wiphy->perm_addr; mac->requested_channel =1 ;memcpy (mac->channels, zd_channels,sizeof (zd_channels));
@@ -625,7 +625,7 @@ struct ieee80211_hw *zd_mac_alloc(structhousekeeping_init (mac);SET_MODULE_OWNER (dev); - dev->dev = &intf->dev; +SET_IEEE80211_DEV (dev, &intf->dev);return dev; }
drivers/net/wireless/d80211/zd1211rw/zd_usb.c +1 -1
@@ -1062,7 +1062,7 @@ static int probe(struct usb_interface *i }dev_dbg_f (&intf->dev,"successful\n" ); -dev_info (&intf->dev,"wiphy%d\n" , dev->index); +dev_info (&intf->dev,"wiphy%d\n" , dev->wiphy->wiphy_index);return 0 ; error:usb_reset_device (interface_to_usbdev (intf));
--
[email protected]
maintainerPATCH 5/5 bcm43xx-d80211: update for wiphy api
In reply to [email protected]update bcm43xx-d80211.
--- drivers/net/wireless/d80211/bcm43xx/bcm43xx_debugfs.c | 2 +- drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-)
drivers/net/wireless/d80211/bcm43xx/bcm43xx_debugfs.c +1 -1
@@ -308,7 +308,7 @@ void bcm43xx_debugfs_add_device(struct b dev->dfsentry = e; -snprintf (devdir,sizeof (devdir),"wiphy%d" , dev->wl->hw->index); +snprintf (devdir,sizeof (devdir),"wiphy%d" , dev->wl->hw->wiphy->wiphy_index); e->subdir =debugfs_create_dir (devdir, fs.root); e->dentry_tsf =debugfs_create_file ("tsf" ,0666 , e->subdir, dev, &tsf_fops);
drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c +6 -9
@@ -3166,7 +3166,7 @@ static int bcm43xx_wireless_core_init(stssb_chipco_set_clockmode (chipco,SSB_CLKMODE_DYNAMIC );bcm43xx_macfilter_clear (dev, BCM43xx_MACFILTER_ASSOC);bcm43xx_macfilter_set (dev, BCM43xx_MACFILTER_SELF, - (u8 *)(wl->hw->perm_addr)); + (u8 *)(wl->hw->wiphy->perm_addr));bcm43xx_security_init (dev);bcm43xx_measure_channel_change_time (dev);
@@ -3562,14 +3562,11 @@ static int bcm43xx_wireless_init(structIEEE80211_HW_WEP_INCLUDE_IV ; hw->maxssi = BCM43xx_RX_MAX_SSI; hw->queues =1 ; - hw->dev = &dev->dev; -if (is_valid_ether_addr (sprom->r1.et1mac)) { -memcpy (hw->perm_addr, sprom->r1.et1mac, -ARRAY_SIZE (hw->perm_addr)); - }else { -memcpy (hw->perm_addr, sprom->r1.il0mac, -ARRAY_SIZE (hw->perm_addr)); - } +SET_IEEE80211_DEV (hw, &dev->dev); +if (is_valid_ether_addr (sprom->r1.et1mac)) +SET_IEEE80211_PERM_ADDR (hw, sprom->r1.et1mac); +else +SET_IEEE80211_PERM_ADDR (hw, sprom->r1.il0mac);/* Get and initialize struct bcm43xx_wl */ wl =hw_to_bcm43xx_wl (hw);
--