Changeset 49

Timestamp:

03/15/03 19:32:07 (9 years ago)

Author:

sam

Message:

Replicated Change 83 by sam@borg_greg on 2003/03/04 17:47:34<<<

o must #ifdef wireless extensions on CONFIG_NET_WIRELESS, not

WIRELESS_EXT; this was causing sizeof(struct ieee80211com) to
be different in the driver because it didn't include <wireless.h>

o eliminate the mgt queue and send mgt frames directly using new

ic_mgtstart method that replaces ic_start; this is more consistent
with Linux style

o remove locking in slow timeout tasklet; it caused recursive locking

when inactivity timer caused deauthentication of node (recursive
path followed when sending management frame requires node lookup)

o manage netdevice queue start/stop entirely in ieee80211_new_state

based on S_RUN state

o change locking to use spin_lock_irq/spin_unlock_irq

Files:

• cvs-import/trunk/wlan/if_ieee80211.h (modified) (4 diffs)
• cvs-import/trunk/wlan/if_ieee80211subr.c (modified) (11 diffs)

cvs-import/trunk/wlan/if_ieee80211.h

@@ -40 +40 @@
-#include <sys/queue.h>
-#include "if_media.h"
+#ifdef CONFIG_NET_WIRELESS
+#include <linux/wireless.h>
+#endif
-
-#define IEEE80211_ADDR_LEN                      6
@@ -543 +546 @@
-        struct timer_list       ic_slowtimo;    /* if watchdog timer */
-        void                    (*ic_watchdog)(struct net_device *);
-
+
+
-        int                     (*ic_init)(struct net_device *);
-        void                    (*ic_recv_mgmt[16])(struct ieee80211com *,
@@ -559 +563 @@
-        u_char                  ic_chan_active[roundup(IEEE80211_CHAN_MAX, NBBY)];
-        u_char                  ic_chan_scan[roundup(IEEE80211_CHAN_MAX,NBBY)];
-        struct sk_buff_head     ic_mgtq;        /* management frame tx q */
-        u_int32_t               ic_flags;       /* state flags */
-        u_int32_t               ic_caps;        /* capabilities */
@@ -596 +599 @@
-        struct proc_dir_entry   *ic_proc;       /* /proc/net/wlan%d */
-#endif
-WIRELESS_EXT
+CONFIG_NET_WIRELESS
-        struct iw_statistics    ic_iwstats;     /* wireless statistics block */
-#endif
-};
-
-
+_irq
+_irq
-
-#define IEEE80211_SEND_MGMT(ic,ni,type,arg)     do {                          \

cvs-import/trunk/wlan/if_ieee80211subr.c

@@ -44 +44 @@
-#include <linux/skbuff.h>
-#include <linux/netdevice.h>
-#include <linux/wireless.h>
-#include <linux/random.h>
-
@@ -118 +117 @@
-static  void ieee80211_proc_remove(struct ieee80211com *);
-#endif /* CONFIG_PROC_FS */
-WIRELESS_EXT
+CONFIG_NET_WIRELESS
-extern  struct iw_statistics *ieee80211_iw_getstats(struct net_device *);
-extern  const struct iw_handler_def ieee80211_iw_handler_def;
@@ -148 +147 @@
-        dev->get_stats = ieee80211_getstats;
-        dev->do_ioctl = ieee80211_ioctl;
-WIRELESS_EXT
+CONFIG_NET_WIRELESS
-        dev->get_wireless_stats = ieee80211_iw_getstats;
-        dev->wireless_handlers = 
-                (struct iw_handler_def *) &ieee80211_iw_handler_def;
-WIRELESS_EXT
+CONFIG_NET_WIRELESS
-        if (register_netdev(&ic->ic_dev)) {
-                printk(KERN_WARNING "%s: unable to register device\n",
@@ -250 +249 @@
-                ic->ic_lintval = 100;           /* default sleep */
-        TAILQ_INIT(&ic->ic_node);
-        skb_queue_head_init(&ic->ic_mgtq);
-
-        /* initialize management frame handlers */
@@ -307 +305 @@
-        IEEE80211_LOCK(ic);
-        del_timer(&ic->ic_slowtimo);
-        skb_queue_purge(&ic->ic_mgtq);
-        if (ic->ic_wep_ctx != NULL) {
-                kfree(ic->ic_wep_ctx);
@@ -326 +323 @@
- * Once a second "slow timeout" a la the BSD ifnet timer.
- */
-static 
+
-ieee80211_slowtimo(unsigned long arg)
-{
-        struct ieee80211com *ic = (struct ieee80211com *) arg;
-
-        IEEE80211_LOCK(ic);
-        if (ic->ic_timer && --ic->ic_timer == 0)
-                if (ic->ic_watchdog)
-                        (*ic->ic_watchdog)(&ic->ic_dev);
+
-        ic->ic_slowtimo.expires = jiffies + HZ;         /* once a second */
-        add_timer(&ic->ic_slowtimo);
-        IEEE80211_UNLOCK(ic);
-}
-
@@ -809 +805 @@
-                            ieee80211_chan2ieee(ic, ni->ni_chan));
-        }
-        skb_queue_tail(&ic->ic_mgtq, skb);
-        ic->ic_timer = 1;
-*ic->ic_start)(
+void) (*ic->ic_mgtstart)(skb, 
-        return 0;
-}
@@ -1030 +1025 @@
-{
-        struct ieee80211com *ic = (void *)dev;
-        struct ieee80211_node *ni, *nextbs;
-
-        if (ic->ic_mgt_timer) {
@@ -1038 +1032 @@
-        if (ic->ic_inact_timer) {
-                if (--ic->ic_inact_timer == 0) {
+                        struct ieee80211_node *ni, *nextbs;
+
-                        for (ni = TAILQ_FIRST(&ic->ic_node); ni != NULL; ) {
-                                if (++ni->ni_inact <= IEEE80211_INACT_MAX) {
@@ -2320 +2316 @@
-                case IEEE80211_S_SCAN:
-                        ic->ic_mgt_timer = 0;
-                        skb_queue_purge(&ic->ic_mgtq);
-                        if (ic->ic_wep_ctx != NULL) {
-                                kfree(ic->ic_wep_ctx);
@@ -2458 +2453 @@
-                        ic->ic_bss.ni_txrate = ic->ic_bss.ni_nrate - 1;
-                        ic->ic_mgt_timer = 0;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        return 0;
-}