Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

15 files changed, 3238 insertions, 0 deletions

diff --git a/include/net/ieee80211softmac.h b/include/net/ieee80211softmac.h
new file mode 100644
index 0000000000..b971d8c82b
--- /dev/null
+++ b/include/net/ieee80211softmac.h
@@ -0,0 +1,292 @@
+/*
+ * ieee80211softmac.h - public interface to the softmac
+ *
+ * Copyright (c) 2005 Johannes Berg <johannes@sipsolutions.net>
+ *                    Joseph Jezak <josejx@gentoo.org>
+ *                    Larry Finger <Larry.Finger@lwfinger.net>
+ *                    Danny van Dyk <kugelfang@gentoo.org>
+ *                    Michael Buesch <mbuesch@freenet.de>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called COPYING.
+ */
+
+#ifndef IEEE80211SOFTMAC_H_
+#define IEEE80211SOFTMAC_H_
+
+#include <linux/kernel.h>
+#include <linux/spinlock.h>
+#include <linux/workqueue.h>
+#include <linux/list.h>
+#include <net/ieee80211.h>
+
+/* Once the API is considered more or less stable,
+ * this should be incremented on API incompatible changes.
+ */
+#define IEEE80211SOFTMAC_API    0
+
+#define IEEE80211SOFTMAC_MAX_RATES_LEN          8
+#define IEEE80211SOFTMAC_MAX_EX_RATES_LEN       255
+
+struct ieee80211softmac_ratesinfo {
+        u8 count;
+        u8 rates[IEEE80211SOFTMAC_MAX_RATES_LEN + IEEE80211SOFTMAC_MAX_EX_RATES_LEN];
+};
+
+/* internal structures */
+struct ieee80211softmac_network;
+struct ieee80211softmac_scaninfo;
+
+struct ieee80211softmac_essid {
+        u8 len;
+        char data[IW_ESSID_MAX_SIZE+1];
+};
+
+struct ieee80211softmac_wpa {
+        char *IE;
+        int IElen;
+        int IEbuflen;
+};
+
+/*
+ * Information about association
+ *
+ * Do we need a lock for this?
+ * We only ever use this structure inlined
+ * into our global struct. I've used its lock,
+ * but maybe we need a local one here?
+ */
+struct ieee80211softmac_assoc_info {
+        /*
+         * This is the requested ESSID. It is written
+         * only by the WX handlers.
+         *
+         */
+        struct ieee80211softmac_essid req_essid;
+        /*
+         * the ESSID of the network we're currently
+         * associated (or trying) to. This is
+         * updated to the network's actual ESSID
+         * even if the requested ESSID was 'ANY'
+         */
+        struct ieee80211softmac_essid associate_essid;
+        
+        /* BSSID we're trying to associate to */
+        char bssid[ETH_ALEN];
+        
+        /* some flags.
+         * static_essid is valid if the essid is constant,
+         * this is for use by the wx handlers only.
+         *
+         * associating is true, if the network has been
+         * auth'ed on and we are in the process of associating.
+         *
+         * bssvalid is true if we found a matching network
+         * and saved it's BSSID into the bssid above.
+         */
+        u8 static_essid:1,
+           associating:1,
+           bssvalid:1;
+
+        /* Scan retries remaining */
+        int scan_retry;
+
+        struct work_struct work;
+        struct work_struct timeout;
+};
+
+enum {
+        IEEE80211SOFTMAC_AUTH_OPEN_REQUEST      = 1,
+        IEEE80211SOFTMAC_AUTH_OPEN_RESPONSE     = 2,
+};
+
+enum {
+        IEEE80211SOFTMAC_AUTH_SHARED_REQUEST    = 1,
+        IEEE80211SOFTMAC_AUTH_SHARED_CHALLENGE = 2,
+        IEEE80211SOFTMAC_AUTH_SHARED_RESPONSE   = 3,
+        IEEE80211SOFTMAC_AUTH_SHARED_PASS       = 4,
+};
+
+/* We should make these tunable
+ * AUTH_TIMEOUT seems really long, but that's what it is in BSD */
+#define IEEE80211SOFTMAC_AUTH_TIMEOUT           (12 * HZ)
+#define IEEE80211SOFTMAC_AUTH_RETRY_LIMIT       5
+#define IEEE80211SOFTMAC_ASSOC_SCAN_RETRY_LIMIT 3
+
+struct ieee80211softmac_txrates {
+        /* The Bit-Rate to be used for multicast frames. */
+        u8 mcast_rate;
+        /* The Bit-Rate to be used for multicast fallback
+         * (If the device supports fallback and hardware-retry)
+         */
+        u8 mcast_fallback;
+        /* The Bit-Rate to be used for any other (normal) data packet. */
+        u8 default_rate;
+        /* The Bit-Rate to be used for default fallback
+         * (If the device supports fallback and hardware-retry)
+         */
+        u8 default_fallback;
+};
+
+/* Bits for txrates_change callback. */
+#define IEEE80211SOFTMAC_TXRATECHG_DEFAULT              (1 << 0) /* default_rate */
+#define IEEE80211SOFTMAC_TXRATECHG_DEFAULT_FBACK        (1 << 1) /* default_fallback */
+#define IEEE80211SOFTMAC_TXRATECHG_MCAST                (1 << 2) /* mcast_rate */
+#define IEEE80211SOFTMAC_TXRATECHG_MCAST_FBACK          (1 << 3) /* mcast_fallback */
+
+struct ieee80211softmac_device {
+        /* 802.11 structure for data stuff */
+        struct ieee80211_device *ieee;
+        struct net_device *dev;
+
+        /* only valid if associated, then holds the Association ID */
+        u16 association_id;
+        
+        /* the following methods are callbacks that the driver
+         * using this framework has to assign
+         */
+
+        /* always assign these */
+        void (*set_bssid_filter)(struct net_device *dev, const u8 *bssid);
+        void (*set_channel)(struct net_device *dev, u8 channel);
+
+        /* assign if you need it, informational only */
+        void (*link_change)(struct net_device *dev);
+
+        /* If the hardware can do scanning, assign _all_ three of these callbacks.
+         * When the scan finishes, call ieee80211softmac_scan_finished().
+         */
+        
+        /* when called, start_scan is guaranteed to not be called again
+         * until you call ieee80211softmac_scan_finished.
+         * Return 0 if scanning could start, error otherwise.
+         * SOFTMAC AUTHORS: don't call this, use ieee80211softmac_start_scan */
+        int (*start_scan)(struct net_device *dev);
+        /* this should block until after ieee80211softmac_scan_finished was called
+         * SOFTMAC AUTHORS: don't call this, use ieee80211softmac_wait_for_scan */
+        void (*wait_for_scan)(struct net_device *dev);
+        /* stop_scan aborts a scan, but is asynchronous.
+         * if you want to wait for it too, use wait_for_scan
+         * SOFTMAC AUTHORS: don't call this, use ieee80211softmac_stop_scan */
+        void (*stop_scan)(struct net_device *dev);
+
+        /* we'll need something about beacons here too, for AP or ad-hoc modes */
+
+        /* Transmission rates to be used by the driver.
+         * The SoftMAC figures out the best possible rates.
+         * The driver just needs to read them.
+         */