rpms/kernel/devel linux-2.6-bcm43xx-wpa.patch, NONE, 1.1 .cvsignore, 1.323, 1.324 kernel-2.6.spec, 1.1851, 1.1852 linux-2.6-devmem.patch, 1.4, 1.5 linux-2.6-softmac-git.patch, 1.3, 1.4 sources, 1.265, 1.266 linux-2.6-queue-stall.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Jan 13 15:50:39 UTC 2006
- Previous message (by thread): rpms/libsepol/devel .cvsignore, 1.80, 1.81 libsepol.spec, 1.103, 1.104 sources, 1.81, 1.82
- Next message (by thread): rpms/alsa-lib/devel alsa-lib-1.0.11-group.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 alsa-lib.spec, 1.39, 1.40 sources, 1.21, 1.22 ainit-0.6-rights.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dwmw2
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9477
Modified Files:
.cvsignore kernel-2.6.spec linux-2.6-devmem.patch
linux-2.6-softmac-git.patch sources
Added Files:
linux-2.6-bcm43xx-wpa.patch
Removed Files:
linux-2.6-queue-stall.patch
Log Message:
git9, WPA on bcm43xx
linux-2.6-bcm43xx-wpa.patch:
0 files changed
--- NEW FILE linux-2.6-bcm43xx-wpa.patch ---
--- linux/drivers/net/wireless/bcm43xx/bcm43xx_wx.c (revision 1051)
+++ linux/drivers/net/wireless/bcm43xx/bcm43xx_wx.c (working copy)
@@ -554,6 +554,21 @@
return err;
}
+static int bcm43xx_wx_set_encodingext(struct net_device *net_dev,
+ struct iw_request_info *info,
+ union iwreq_data *data,
+ char *extra)
+{
+ struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+ int err;
+
+ wx_enter();
+
+ err = ieee80211_wx_set_encodeext(bcm->ieee, info, data, extra);
+
+ return err;
+}
+
static int bcm43xx_wx_get_encoding(struct net_device *net_dev,
struct iw_request_info *info,
union iwreq_data *data,
@@ -569,6 +584,21 @@
return err;
}
+static int bcm43xx_wx_get_encodingext(struct net_device *net_dev,
+ struct iw_request_info *info,
+ union iwreq_data *data,
+ char *extra)
+{
+ struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+ int err;
+
+ wx_enter();
+
+ err = ieee80211_wx_get_encodeext(bcm->ieee, info, data, extra);
+
+ return err;
+}
+
static int bcm43xx_wx_set_power(struct net_device *net_dev,
struct iw_request_info *info,
union iwreq_data *data,
@@ -970,11 +1000,15 @@
/* Encoding */
WX(SIOCSIWENCODE) = bcm43xx_wx_set_encoding,
WX(SIOCGIWENCODE) = bcm43xx_wx_get_encoding,
+ WX(SIOCSIWENCODEEXT) = bcm43xx_wx_set_encodingext,
+ WX(SIOCGIWENCODEEXT) = bcm43xx_wx_get_encodingext,
/* Power saving */
//TODO WX(SIOCSIWPOWER) = bcm43xx_wx_set_power,
//TODO WX(SIOCGIWPOWER) = bcm43xx_wx_get_power,
WX(SIOCSIWGENIE) = ieee80211softmac_wx_set_genie,
WX(SIOCGIWGENIE) = ieee80211softmac_wx_get_genie,
+ WX(SIOCSIWAUTH) = ieee80211_wx_set_auth,
+ WX(SIOCGIWAUTH) = ieee80211_wx_get_auth,
};
#undef WX
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -r1.323 -r1.324
--- .cvsignore 12 Jan 2006 23:52:50 -0000 1.323
+++ .cvsignore 13 Jan 2006 15:50:35 -0000 1.324
@@ -3,5 +3,4 @@
kernel-2.6.15
linux-2.6.15.tar.bz2
bcm43xx-20060111.tar.bz2
-patch-2.6.15-git7a.bz2
-patch-2.6.15-git8.bz2
+patch-2.6.15-git9.bz2
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1851
retrieving revision 1.1852
diff -u -r1.1851 -r1.1852
--- kernel-2.6.spec 13 Jan 2006 08:27:34 -0000 1.1851
+++ kernel-2.6.spec 13 Jan 2006 15:50:35 -0000 1.1852
@@ -207,7 +207,7 @@
#
# Patches 0 through 100 are meant for core subsystem upgrades
#
-Patch1: patch-2.6.15-git8.bz2
+Patch1: patch-2.6.15-git9.bz2
#Patch2: patch-2.6.16-rc1-git1.bz2
# Patches 100 through 500 are meant for architecture patches
@@ -351,7 +351,6 @@
Patch1830: linux-2.6-w1-hush-debug.patch
Patch1840: linux-2.6-x86-hp-reboot.patch
Patch1850: linux-2.6-mv643xx-compile-fix.patch
-Patch1860: linux-2.6-queue-stall.patch
# Warn about usage of various obsolete functionality that may go away.
Patch1900: linux-2.6-obsolete-idescsi-warning.patch
@@ -374,6 +373,7 @@
# Broadcom wireless driver
Patch5000: linux-2.6-softmac-git.patch
Patch5001: linux-2.6-bcm43xx.patch
+Patch5002: linux-2.6-bcm43xx-wpa.patch
#
# 10000 to 20000 is for stuff that has to come last due to the
@@ -834,8 +834,6 @@
%patch1840 -p1
# Fix compilation for MV643xx Ethernet
%patch1850 -p1
-# Fix disk I/O queue stalls
-%patch1860 -p1
# Warn about obsolete functionality usage.
%patch1900 -p1
%patch1901 -p1
@@ -874,6 +872,8 @@
%patch5000 -p1
# Patch Kconfig and Makefiles to merge bcm43xx 'properly'
%patch5001 -p1
+# Add WPA support
+%patch5002 -p1
#
# final stuff
@@ -1360,6 +1360,10 @@
%changelog
* Fri Jan 13 2006 David Woodhouse <dwmw2 at redhat.com>
+- Update softmac and add WPA support to bcm43xx driver
+- 2.6.15-git9
+
+* Fri Jan 13 2006 David Woodhouse <dwmw2 at redhat.com>
- Add TIF_RESTORE_SIGMASK patches.
- Fix I/O queue stalls
linux-2.6-devmem.patch:
arch/powerpc/mm/mem.c | 14 +++
linux-1050/arch/i386/mm/init.c | 19 ++++
linux-1050/arch/ia64/mm/init.c | 7 +
linux-1050/arch/s390/mm/init.c | 5 +
linux-1050/arch/x86_64/mm/init.c | 20 ++++
linux-1050/drivers/char/mem.c | 146 ++++----------------------------
linux-1050/fs/proc/kcore.c | 2
linux-1050/include/asm-alpha/page.h | 1
linux-1050/include/asm-arm/page.h | 2
linux-1050/include/asm-arm26/page.h | 2
linux-1050/include/asm-cris/page.h | 2
linux-1050/include/asm-h8300/page.h | 2
linux-1050/include/asm-i386/page.h | 4
linux-1050/include/asm-ia64/page.h | 2
linux-1050/include/asm-m68k/page.h | 2
linux-1050/include/asm-m68knommu/page.h | 2
linux-1050/include/asm-mips/page.h | 2
linux-1050/include/asm-parisc/page.h | 2
linux-1050/include/asm-ppc/page.h | 2
linux-1050/include/asm-s390/page.h | 2
linux-1050/include/asm-sh/page.h | 2
linux-1050/include/asm-sh64/page.h | 2
linux-1050/include/asm-sparc/page.h | 2
linux-1050/include/asm-sparc64/page.h | 2
linux-1050/include/asm-um/page.h | 1
linux-1050/include/asm-v850/page.h | 2
linux-1050/include/asm-x86_64/page.h | 4
linux-2.6.13/arch/x86_64/mm/init.c | 22 ++++
linux-2.6.14/include/asm-powerpc/page.h | 2
29 files changed, 154 insertions(+), 125 deletions(-)
Index: linux-2.6-devmem.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-devmem.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-devmem.patch 15 Nov 2005 17:23:57 -0000 1.4
+++ linux-2.6-devmem.patch 13 Jan 2006 15:50:35 -0000 1.5
@@ -299,7 +299,7 @@
- return virtr + wrote;
-}
-
- #if (defined(CONFIG_ISA) || !defined(__mc68000__)) && (!defined(CONFIG_PPC_ISERIES) || defined(CONFIG_PCI))
+ #if defined(CONFIG_ISA) || !defined(__mc68000__)
static ssize_t read_port(struct file * file, char __user * buf,
size_t count, loff_t *ppos)
@@ -717,7 +617,6 @@ static struct file_operations mem_fops =
linux-2.6-softmac-git.patch:
include/net/ieee80211.h | 8
include/net/ieee80211softmac.h | 292 ++++++++++++++
include/net/ieee80211softmac_wx.h | 94 ++++
net/ieee80211/Kconfig | 1
net/ieee80211/Makefile | 1
net/ieee80211/ieee80211_module.c | 2
net/ieee80211/ieee80211_rx.c | 4
net/ieee80211/ieee80211_wx.c | 89 ++++
net/ieee80211/softmac/Kconfig | 10
net/ieee80211/softmac/Makefile | 9
net/ieee80211/softmac/ieee80211softmac_assoc.c | 392 +++++++++++++++++++
net/ieee80211/softmac/ieee80211softmac_auth.c | 376 +++++++++++++++++++
net/ieee80211/softmac/ieee80211softmac_event.c | 159 ++++++++
net/ieee80211/softmac/ieee80211softmac_io.c | 474 ++++++++++++++++++++++++
net/ieee80211/softmac/ieee80211softmac_module.c | 456 +++++++++++++++++++++++
net/ieee80211/softmac/ieee80211softmac_priv.h | 237 ++++++++++++
net/ieee80211/softmac/ieee80211softmac_scan.c | 237 ++++++++++++
net/ieee80211/softmac/ieee80211softmac_wx.c | 412 ++++++++++++++++++++
18 files changed, 3250 insertions(+), 3 deletions(-)
Index: linux-2.6-softmac-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-softmac-git.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-softmac-git.patch 11 Jan 2006 13:04:21 -0000 1.3
+++ linux-2.6-softmac-git.patch 13 Jan 2006 15:50:35 -0000 1.4
@@ -1,33 +1,54 @@
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
-index cde2f4f..df05f46 100644
+index df05f46..c1cb23a 100644
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
-@@ -363,8 +363,9 @@ enum ieee80211_reasoncode {
- #define IEEE80211_OFDM_SHIFT_MASK_A 4
+@@ -1122,6 +1122,14 @@ extern int ieee80211_wx_set_encodeext(st
+ extern int ieee80211_wx_get_encodeext(struct ieee80211_device *ieee,
+ struct iw_request_info *info,
+ union iwreq_data *wrqu, char *extra);
++extern int ieee80211_wx_set_auth(struct net_device *dev,
++ struct iw_request_info *info,
++ union iwreq_data *wrqu,
++ char *extra);
++extern int ieee80211_wx_get_auth(struct net_device *dev,
++ struct iw_request_info *info,
++ union iwreq_data *wrqu,
++ char *extra);
- /* NOTE: This data is for statistical purposes; not all hardware provides this
-- * information for frames received. Not setting these will not cause
-- * any adverse affects. */
-+ * information for frames received.
-+ * For ieee80211_rx_mgt, you need to set at least the 'len' parameter.
-+ */
- struct ieee80211_rx_stats {
- u32 mac_time;
- s8 rssi;
-@@ -1088,6 +1089,7 @@ extern int ieee80211_tx_frame(struct iee
- /* ieee80211_rx.c */
- extern int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
- struct ieee80211_rx_stats *rx_stats);
-+/* make sure to set stats->len */
- extern void ieee80211_rx_mgt(struct ieee80211_device *ieee,
- struct ieee80211_hdr_4addr *header,
- struct ieee80211_rx_stats *stats);
+ static inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
+ {
diff --git a/include/net/ieee80211softmac.h b/include/net/ieee80211softmac.h
new file mode 100644
-index 0000000..7264bd8
+index 0000000..b971d8c
--- /dev/null
+++ b/include/net/ieee80211softmac.h
-@@ -0,0 +1,266 @@
+@@ -0,0 +1,292 @@
++/*
++ * ieee80211softmac.h - public interface to the softmac
++ *
++ * Copyright (c) 2005 Johannes Berg <johannes at sipsolutions.net>
++ * Joseph Jezak <josejx at gentoo.org>
++ * Larry Finger <Larry.Finger at lwfinger.net>
++ * Danny van Dyk <kugelfang at gentoo.org>
++ * Michael Buesch <mbuesch at 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_
+
@@ -296,10 +317,38 @@
+#endif /* IEEE80211SOFTMAC_H_ */
diff --git a/include/net/ieee80211softmac_wx.h b/include/net/ieee80211softmac_wx.h
new file mode 100644
-index 0000000..165ea4c
+index 0000000..3e0be45
--- /dev/null
+++ b/include/net/ieee80211softmac_wx.h
-@@ -0,0 +1,66 @@
+@@ -0,0 +1,94 @@
++/*
++ * This file contains the prototypes for the wireless extension
++ * handlers that the softmac API provides. Include this file to
++ * use the wx handlers, you can assign these directly.
++ *
++ * Copyright (c) 2005 Johannes Berg <johannes at sipsolutions.net>
++ * Joseph Jezak <josejx at gentoo.org>
++ * Larry Finger <Larry.Finger at lwfinger.net>
++ * Danny van Dyk <kugelfang at gentoo.org>
++ * Michael Buesch <mbuesch at 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_WX_H
+#define _IEEE80211SOFTMAC_WX_H
+
@@ -398,7 +447,7 @@
static int show_debug_level(char *page, char **start, off_t offset,
int count, int *eof, void *data)
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
-index 4cc6f41..9943096 100644
+index 5e33803..64eceb7 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -1289,9 +1289,9 @@ static inline void update_network(struct
@@ -413,6 +462,109 @@
}
static inline void ieee80211_process_probe_response(struct ieee80211_device
+diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
+index 406d5b9..2f16cbe 100644
+--- a/net/ieee80211/ieee80211_wx.c
++++ b/net/ieee80211/ieee80211_wx.c
+@@ -726,9 +726,98 @@ int ieee80211_wx_get_encodeext(struct ie
+ return 0;
+ }
+
++int ieee80211_wx_set_auth(struct net_device *dev,
++ struct iw_request_info *info,
++ union iwreq_data *wrqu,
++ char *extra)
++{
++ struct ieee80211_device *ieee = netdev_priv(dev);
++ unsigned long flags;
++ int err = 0;
++
++ spin_lock_irqsave(&ieee->lock, flags);
++
++ switch (wrqu->param.flags & IW_AUTH_INDEX) {
++ case IW_AUTH_WPA_VERSION:
++ case IW_AUTH_CIPHER_PAIRWISE:
++ case IW_AUTH_CIPHER_GROUP:
++ case IW_AUTH_KEY_MGMT:
++ /*
++ * Host AP driver does not use these parameters and allows
++ * wpa_supplicant to control them internally.
++ */
++ break;
++ case IW_AUTH_TKIP_COUNTERMEASURES:
++ break; /* FIXME */
++ case IW_AUTH_DROP_UNENCRYPTED:
++ ieee->drop_unencrypted = !!wrqu->param.value;
++ break;
++ case IW_AUTH_80211_AUTH_ALG:
++ break; /* FIXME */
++ case IW_AUTH_WPA_ENABLED:
++ ieee->privacy_invoked = ieee->wpa_enabled = !!wrqu->param.value;
++ break;
++ case IW_AUTH_RX_UNENCRYPTED_EAPOL:
++ ieee->ieee802_1x = !!wrqu->param.value;
++ break;
++ case IW_AUTH_PRIVACY_INVOKED:
++ ieee->privacy_invoked = !!wrqu->param.value;
++ break;
++ default:
++ err = -EOPNOTSUPP;
++ break;
++ }
++ spin_unlock_irqrestore(&ieee->lock, flags);
++ return err;
++}
++
++int ieee80211_wx_get_auth(struct net_device *dev,
++ struct iw_request_info *info,
++ union iwreq_data *wrqu,
++ char *extra)
++{
++ struct ieee80211_device *ieee = netdev_priv(dev);
++ unsigned long flags;
++ int err = 0;
++
++ spin_lock_irqsave(&ieee->lock, flags);
++
++ switch (wrqu->param.flags & IW_AUTH_INDEX) {
++ case IW_AUTH_WPA_VERSION:
++ case IW_AUTH_CIPHER_PAIRWISE:
++ case IW_AUTH_CIPHER_GROUP:
++ case IW_AUTH_KEY_MGMT:
++ case IW_AUTH_TKIP_COUNTERMEASURES: /* FIXME */
++ case IW_AUTH_80211_AUTH_ALG: /* FIXME */
++ /*
++ * Host AP driver does not use these parameters and allows
++ * wpa_supplicant to control them internally.
++ */
++ err = -EOPNOTSUPP;
++ break;
++ case IW_AUTH_DROP_UNENCRYPTED:
++ wrqu->param.value = ieee->drop_unencrypted;
++ break;
++ case IW_AUTH_WPA_ENABLED:
++ wrqu->param.value = ieee->wpa_enabled;
++ break;
++ case IW_AUTH_RX_UNENCRYPTED_EAPOL:
++ wrqu->param.value = ieee->ieee802_1x;
++ break;
++ default:
++ err = -EOPNOTSUPP;
++ break;
++ }
++ spin_unlock_irqrestore(&ieee->lock, flags);
++ return err;
++}
++
+ EXPORT_SYMBOL(ieee80211_wx_set_encodeext);
+ EXPORT_SYMBOL(ieee80211_wx_get_encodeext);
+
+ EXPORT_SYMBOL(ieee80211_wx_get_scan);
+ EXPORT_SYMBOL(ieee80211_wx_set_encode);
+ EXPORT_SYMBOL(ieee80211_wx_get_encode);
++
++EXPORT_SYMBOL_GPL(ieee80211_wx_set_auth);
++EXPORT_SYMBOL_GPL(ieee80211_wx_get_auth);
diff --git a/net/ieee80211/softmac/Kconfig b/net/ieee80211/softmac/Kconfig
new file mode 100644
index 0000000..6cd9f34
@@ -446,10 +598,36 @@
+ ieee80211softmac_event.o
diff --git a/net/ieee80211/softmac/ieee80211softmac_assoc.c b/net/ieee80211/softmac/ieee80211softmac_assoc.c
new file mode 100644
-index 0000000..aef018f
+index 0000000..b29fb1c
--- /dev/null
+++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c
-@@ -0,0 +1,366 @@
+@@ -0,0 +1,392 @@
++/*
++ * This file contains the softmac's association logic.
++ *
++ * Copyright (c) 2005 Johannes Berg <johannes at sipsolutions.net>
++ * Joseph Jezak <josejx at gentoo.org>
++ * Larry Finger <Larry.Finger at lwfinger.net>
++ * Danny van Dyk <kugelfang at gentoo.org>
++ * Michael Buesch <mbuesch at 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.
++ */
++
+#include "ieee80211softmac_priv.h"
+
+/*
@@ -818,10 +996,36 @@
+}
diff --git a/net/ieee80211/softmac/ieee80211softmac_auth.c b/net/ieee80211/softmac/ieee80211softmac_auth.c
new file mode 100644
-index 0000000..6eab2be
+index 0000000..84ad029
--- /dev/null
+++ b/net/ieee80211/softmac/ieee80211softmac_auth.c
-@@ -0,0 +1,350 @@
+@@ -0,0 +1,376 @@
++/*
++ * This file contains the softmac's authentication logic.
++ *
++ * Copyright (c) 2005 Johannes Berg <johannes at sipsolutions.net>
++ * Joseph Jezak <josejx at gentoo.org>
++ * Larry Finger <Larry.Finger at lwfinger.net>
++ * Danny van Dyk <kugelfang at gentoo.org>
++ * Michael Buesch <mbuesch at 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.
++ */
++
+#include "ieee80211softmac_priv.h"
+
+static void ieee80211softmac_auth_queue(void *data);
@@ -1174,16 +1378,40 @@
+}
diff --git a/net/ieee80211/softmac/ieee80211softmac_event.c b/net/ieee80211/softmac/ieee80211softmac_event.c
new file mode 100644
-index 0000000..b640a58
+index 0000000..0ed8e30
--- /dev/null
+++ b/net/ieee80211/softmac/ieee80211softmac_event.c
-@@ -0,0 +1,135 @@
-+#include "ieee80211softmac_priv.h"
-+
+@@ -0,0 +1,159 @@
+/*
+ * Event system
-+ * Also see comments in public header file
++ * Also see comments in public header file and longer explanation below.
++ *
++ * Copyright (c) 2005 Johannes Berg <johannes at sipsolutions.net>
++ * Joseph Jezak <josejx at gentoo.org>
++ * Larry Finger <Larry.Finger at lwfinger.net>
++ * Danny van Dyk <kugelfang at gentoo.org>
++ * Michael Buesch <mbuesch at 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.
++ */
++
++#include "ieee80211softmac_priv.h"
++
++/*
+ * Each event has associated to it
+ * - an event type (see constants in public header)
+ * - an event context (see below)
@@ -1795,10 +2023,36 @@
+}
diff --git a/net/ieee80211/softmac/ieee80211softmac_module.c b/net/ieee80211/softmac/ieee80211softmac_module.c
new file mode 100644
-index 0000000..ea4a19e
+index 0000000..671f83b
--- /dev/null
+++ b/net/ieee80211/softmac/ieee80211softmac_module.c
-@@ -0,0 +1,425 @@
+@@ -0,0 +1,456 @@
++/*
++ * Contains some basic softmac functions along with module registration code etc.
++ *
++ * Copyright (c) 2005 Johannes Berg <johannes at sipsolutions.net>
++ * Joseph Jezak <josejx at gentoo.org>
++ * Larry Finger <Larry.Finger at lwfinger.net>
++ * Danny van Dyk <kugelfang at gentoo.org>
++ * Michael Buesch <mbuesch at 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.
++ */
++
+#include "ieee80211softmac_priv.h"
+#include <linux/sort.h>
+
@@ -1846,6 +2100,7 @@
+
+ return dev;
+}
++EXPORT_SYMBOL_GPL(alloc_ieee80211softmac);
+
+/* Clears the pending work queue items, stops all scans, etc. */
+void
@@ -1878,7 +2133,7 @@
+ spin_unlock_irqrestore(&sm->lock, flags);
+ flush_scheduled_work();
+
-+ // now we should be save and no longer need locking...
++ /* now we should be save and no longer need locking... */
+ spin_lock_irqsave(&sm->lock, flags);
+ /* Free all pending auth work items */
+ list_for_each_entry_safe(authptr, authtmp, &sm->auth_queue, list) {
@@ -1902,6 +2157,7 @@
+
+ spin_unlock_irqrestore(&sm->lock, flags);
+}
++EXPORT_SYMBOL_GPL(ieee80211softmac_clear_pending_work);
+
+void free_ieee80211softmac(struct net_device *dev)
+{
@@ -1911,6 +2167,7 @@
+ kfree(sm->wpa.IE);
+ free_ieee80211(dev);
+}
++EXPORT_SYMBOL_GPL(free_ieee80211softmac);
+
+static void ieee80211softmac_start_check_rates(struct ieee80211softmac_device *mac)
+{
@@ -1969,6 +2226,7 @@
+ if (mac->txrates_change)
+ mac->txrates_change(dev, change, &oldrates);
+}
++EXPORT_SYMBOL_GPL(ieee80211softmac_start);
+
+void ieee80211softmac_stop(struct net_device *dev)
+{
@@ -1976,6 +2234,7 @@
+
+ ieee80211softmac_clear_pending_work(mac);
+}
++EXPORT_SYMBOL_GPL(ieee80211softmac_stop);
+
+void ieee80211softmac_set_rates(struct net_device *dev, u8 count, u8 *rates)
+{
@@ -1987,6 +2246,7 @@
+ mac->ratesinfo.count = count;
+ spin_unlock_irqrestore(&mac->lock, flags);
+}
++EXPORT_SYMBOL_GPL(ieee80211softmac_set_rates);
+
+static u8 raise_rate(struct ieee80211softmac_device *mac, u8 rate)
+{
@@ -2069,6 +2329,7 @@
+
+ spin_unlock_irqrestore(&mac->lock, flags);
+}
++EXPORT_SYMBOL_GPL(ieee80211softmac_fragment_lost);
+
+static int rate_cmp(const void *a_, const void *b_) {
+ u8 *a, *b;
@@ -2216,20 +2477,44 @@
+}
+
+MODULE_LICENSE("GPL");
-+
-+EXPORT_SYMBOL_GPL(alloc_ieee80211softmac);
-+EXPORT_SYMBOL_GPL(free_ieee80211softmac);
-+EXPORT_SYMBOL_GPL(ieee80211softmac_set_rates);
-+EXPORT_SYMBOL_GPL(ieee80211softmac_start);
-+EXPORT_SYMBOL_GPL(ieee80211softmac_stop);
-+EXPORT_SYMBOL_GPL(ieee80211softmac_fragment_lost);
-+EXPORT_SYMBOL_GPL(ieee80211softmac_clear_pending_work);
++MODULE_AUTHOR("Johannes Berg");
++MODULE_AUTHOR("Joseph Jezak");
++MODULE_AUTHOR("Larry Finger");
++MODULE_AUTHOR("Danny van Dyk");
++MODULE_AUTHOR("Michael Buesch");
++MODULE_DESCRIPTION("802.11 software MAC");
diff --git a/net/ieee80211/softmac/ieee80211softmac_priv.h b/net/ieee80211/softmac/ieee80211softmac_priv.h
new file mode 100644
-index 0000000..44a8ba4
+index 0000000..5b98c3e
--- /dev/null
+++ b/net/ieee80211/softmac/ieee80211softmac_priv.h
-@@ -0,0 +1,211 @@
+@@ -0,0 +1,237 @@
++/*
++ * Internal softmac API definitions.
++ *
++ * Copyright (c) 2005 Johannes Berg <johannes at sipsolutions.net>
++ * Joseph Jezak <josejx at gentoo.org>
++ * Larry Finger <Larry.Finger at lwfinger.net>
++ * Danny van Dyk <kugelfang at gentoo.org>
++ * Michael Buesch <mbuesch at 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_PRIV_H_
+#define IEEE80211SOFTMAC_PRIV_H_
+
@@ -2443,14 +2728,36 @@
+#endif /* IEEE80211SOFTMAC_PRIV_H_ */
diff --git a/net/ieee80211/softmac/ieee80211softmac_scan.c b/net/ieee80211/softmac/ieee80211softmac_scan.c
new file mode 100644
-index 0000000..1a1eda4
+index 0000000..d90d31f
--- /dev/null
+++ b/net/ieee80211/softmac/ieee80211softmac_scan.c
-@@ -0,0 +1,216 @@
+@@ -0,0 +1,237 @@
+/*
+ * Scanning routines.
+ *
+ * These are not exported because they're assigned to the function pointers.
++ *
++ * Copyright (c) 2005 Johannes Berg <johannes at sipsolutions.net>
++ * Joseph Jezak <josejx at gentoo.org>
++ * Larry Finger <Larry.Finger at lwfinger.net>
++ * Danny van Dyk <kugelfang at gentoo.org>
++ * Michael Buesch <mbuesch at 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.
+ */
+
+#include <linux/completion.h>
@@ -2533,7 +2840,6 @@
+
+ if (!invalid_channel) {
+ sm->set_channel(sm->dev, si->channels[current_channel_idx].channel);
-+ //TODO: Probe the channel
+ // FIXME make this user configurable (active/passive)
+ if(ieee80211softmac_send_mgt_frame(sm, NULL, IEEE80211_STYPE_PROBE_REQ, 0))
+ printkl(KERN_DEBUG PFX "Sending Probe Request Failed\n");
@@ -2665,12 +2971,34 @@
+EXPORT_SYMBOL_GPL(ieee80211softmac_scan_finished);
diff --git a/net/ieee80211/softmac/ieee80211softmac_wx.c b/net/ieee80211/softmac/ieee80211softmac_wx.c
new file mode 100644
-index 0000000..ca11737
+index 0000000..17d30f4
--- /dev/null
+++ b/net/ieee80211/softmac/ieee80211softmac_wx.c
-@@ -0,0 +1,390 @@
+@@ -0,0 +1,412 @@
+/*
+ * This file contains our _wx handlers. Make sure you EXPORT_SYMBOL_GPL them
++ *
++ * Copyright (c) 2005 Johannes Berg <johannes at sipsolutions.net>
++ * Joseph Jezak <josejx at gentoo.org>
++ * Larry Finger <Larry.Finger at lwfinger.net>
++ * Danny van Dyk <kugelfang at gentoo.org>
++ * Michael Buesch <mbuesch at 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.
+ */
+
+#include "ieee80211softmac_priv.h"
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -r1.265 -r1.266
--- sources 12 Jan 2006 23:52:50 -0000 1.265
+++ sources 13 Jan 2006 15:50:35 -0000 1.266
@@ -1,4 +1,3 @@
cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2
e7291436e5d71b575dea034883cb42e5 bcm43xx-20060111.tar.bz2
-f791ce18c0e962f30dce760274f6be07 patch-2.6.15-git7a.bz2
-17649f28b91b319cb916a89f46eb37c3 patch-2.6.15-git8.bz2
+e2b01ad85559d6f690cadca732347936 patch-2.6.15-git9.bz2
--- linux-2.6-queue-stall.patch DELETED ---
- Previous message (by thread): rpms/libsepol/devel .cvsignore, 1.80, 1.81 libsepol.spec, 1.103, 1.104 sources, 1.81, 1.82
- Next message (by thread): rpms/alsa-lib/devel alsa-lib-1.0.11-group.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 alsa-lib.spec, 1.39, 1.40 sources, 1.21, 1.22 ainit-0.6-rights.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list