rpms/kernel/devel .cvsignore, 1.320, 1.321 kernel-2.6.spec, 1.1842, 1.1843 linux-2.6-softmac-git.patch, 1.2, 1.3 sources, 1.262, 1.263 linux-2.6-bcm43xx-resume.patch, 1.2, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jan 11 13:04:33 UTC 2006
Author: dwmw2
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8828
Modified Files:
.cvsignore kernel-2.6.spec linux-2.6-softmac-git.patch sources
Removed Files:
linux-2.6-bcm43xx-resume.patch
Log Message:
Update to a proper snapshot now it's a slower-moving target
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -r1.320 -r1.321
--- .cvsignore 11 Jan 2006 00:01:10 -0000 1.320
+++ .cvsignore 11 Jan 2006 13:04:20 -0000 1.321
@@ -2,5 +2,5 @@
temp-*
kernel-2.6.15
linux-2.6.15.tar.bz2
-bcm43xx-20060106.tar.bz2
-patch-2.6.15-git6a.bz2
+bcm43xx-20060111.tar.bz2
+patch-2.6.15-git7.bz2
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1842
retrieving revision 1.1843
diff -u -r1.1842 -r1.1843
--- kernel-2.6.spec 11 Jan 2006 01:40:18 -0000 1.1842
+++ kernel-2.6.spec 11 Jan 2006 13:04:20 -0000 1.1843
@@ -183,7 +183,7 @@
Source10: COPYING.modules
Source11: genkey
-%define BCMVER 20060106
+%define BCMVER 20060111
Source13: ftp://ftp.berlios.de/pub/bcm43xx/snapshots/bcm43xx/bcm43xx-%{BCMVER}.tar.bz2
Source20: kernel-%{kversion}-i586.config
@@ -207,7 +207,7 @@
#
# Patches 0 through 100 are meant for core subsystem upgrades
#
-Patch1: patch-2.6.15-git6a.bz2
+Patch1: patch-2.6.15-git7.bz2
#Patch2: patch-2.6.16-rc1-git1.bz2
# Patches 100 through 500 are meant for architecture patches
@@ -372,7 +372,6 @@
# Broadcom wireless driver
Patch5000: linux-2.6-softmac-git.patch
Patch5001: linux-2.6-bcm43xx.patch
-Patch5002: linux-2.6-bcm43xx-resume.patch
#
# 10000 to 20000 is for stuff that has to come last due to the
@@ -872,8 +871,6 @@
%patch5000 -p1
# Patch Kconfig and Makefiles to merge bcm43xx 'properly'
%patch5001 -p1
-# Fix the reassociate on resume code
-%patch5002 -p1
#
# final stuff
@@ -1361,6 +1358,11 @@
%changelog
* Wed Jan 11 2006 David Woodhouse <dwmw2 at redhat.com>
+- 2.6.15-git7
+- Turn off CONFIG_DEBUG_MUTEXES since it makes the G5 not boot
+- Update bcm43xx and softmac
+
+* Wed Jan 11 2006 David Woodhouse <dwmw2 at redhat.com>
- 2.6.15-git6a (49cd619c69d643b30a24029e40eb5364c7a26b2e)
- Disable S390
linux-2.6-softmac-git.patch:
include/net/ieee80211.h | 6
include/net/ieee80211softmac.h | 266 +++++++++++++
include/net/ieee80211softmac_wx.h | 66 +++
net/ieee80211/Kconfig | 1
net/ieee80211/Makefile | 1
net/ieee80211/ieee80211_module.c | 2
net/ieee80211/ieee80211_rx.c | 4
net/ieee80211/softmac/Kconfig | 10
net/ieee80211/softmac/Makefile | 9
net/ieee80211/softmac/ieee80211softmac_assoc.c | 366 ++++++++++++++++++
net/ieee80211/softmac/ieee80211softmac_auth.c | 350 +++++++++++++++++
net/ieee80211/softmac/ieee80211softmac_event.c | 135 ++++++
net/ieee80211/softmac/ieee80211softmac_io.c | 474 ++++++++++++++++++++++++
net/ieee80211/softmac/ieee80211softmac_module.c | 425 +++++++++++++++++++++
net/ieee80211/softmac/ieee80211softmac_priv.h | 211 ++++++++++
net/ieee80211/softmac/ieee80211softmac_scan.c | 216 ++++++++++
net/ieee80211/softmac/ieee80211softmac_wx.c | 390 +++++++++++++++++++
17 files changed, 2927 insertions(+), 5 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-softmac-git.patch 10 Jan 2006 01:45:59 -0000 1.2
+++ linux-2.6-softmac-git.patch 11 Jan 2006 13:04:21 -0000 1.3
@@ -446,10 +446,10 @@
+ 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..085022f
+index 0000000..aef018f
--- /dev/null
+++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c
-@@ -0,0 +1,356 @@
+@@ -0,0 +1,366 @@
+#include "ieee80211softmac_priv.h"
+
+/*
@@ -616,9 +616,14 @@
+ if (mac->associnfo.bssvalid)
+ found = ieee80211softmac_get_network_by_bssid(mac, mac->associnfo.bssid);
+
-+ /* Search the ieee80211 networks for this network if we didn't find it */
-+ if (!found)
++ /* Search the ieee80211 networks for this network if we didn't find it by bssid,
++ * but only if we've scanned at least once (to get a better list of networks to
++ * select from). If we have not scanned before, the !found logic below will be
++ * invoked and will scan. */
++ if (!found && (mac->associnfo.scan_retry < IEEE80211SOFTMAC_ASSOC_SCAN_RETRY_LIMIT))
+ {
++ s8 rssi = -128; /* if I don't initialise, gcc emits an invalid warning
++ because it cannot follow the best pointer logic. */
+ spin_lock_irqsave(&mac->ieee->lock, flags);
+ list_for_each_entry(net, &mac->ieee->network_list, list) {
+ /* we're supposed to find the network with
@@ -626,7 +631,7 @@
+ * any network with a specific ESSID, and many
+ * different ones could have that.
+ *
-+ * I'll for now implement just finding one at all
++ * I'll for now just go with the reported rssi.
+ *
+ * We also should take into account the rateset
+ * here to find the best BSSID to try.
@@ -634,15 +639,17 @@
+ if (network_matches_request(mac, net)) {
+ if (!best) {
+ best = net;
++ rssi = best->stats.rssi;
+ continue;
+ }
+ /* we already had a matching network, so
+ * compare their properties to get the
+ * better of the two ... (see above)
+ */
-+ /* TODO */
-+ /* for now, just */
-+ break;
++ if (rssi < net->stats.rssi) {
++ best = net;
++ rssi = best->stats.rssi;
++ }
+ }
+ }
+ /* if we unlock here, we might get interrupted and the `best'
@@ -666,12 +673,10 @@
+ * NB: this also happens if we had no memory to copy the network info...
+ * Maybe we can hope to have more memory after scanning finishes ;)
+ */
-+ dprintk(KERN_INFO PFX "Associate: Network not known, trying to initiate scan: ");
++ dprintk(KERN_INFO PFX "Associate: Scanning for networks first.\n");
+ ieee80211softmac_notify(mac->dev, IEEE80211SOFTMAC_EVENT_SCAN_FINISHED, ieee80211softmac_assoc_notify, NULL);
+ if (ieee80211softmac_start_scan(mac))
-+ dprintk("failed.\n");
-+ else
-+ dprintk("ok.\n");
++ dprintk(KERN_INFO PFX "Associate: failed to initiate scan. Is device up?\n");
+ return;
+ }
+ else {
@@ -680,7 +685,7 @@
+ mac->associated = 0;
+ spin_unlock_irqrestore(&mac->lock, flags);
+
-+ dprintk(KERN_INFO PFX "Unable to find network after scan!\n");
++ dprintk(KERN_INFO PFX "Unable to find matching network after scan!\n");
+ ieee80211softmac_call_events(mac, IEEE80211SOFTMAC_EVENT_ASSOCIATE_NET_NOT_FOUND, NULL);
+ return;
+ }
@@ -797,11 +802,16 @@
+{
+ struct ieee80211softmac_device *mac = ieee80211_priv(dev);
+ unsigned long flags;
++ if (memcmp(disassoc->header.addr2, mac->associnfo.bssid, ETH_ALEN))
++ return 0;
++ if (memcmp(disassoc->header.addr1, mac->dev->dev_addr, ETH_ALEN))
++ return 0;
+ dprintk(KERN_INFO PFX "got disassoc frame\n");
+ netif_carrier_off(dev);
+ spin_lock_irqsave(&mac->lock, flags);
+ mac->associnfo.bssvalid = 0;
+ mac->associated = 0;
++ schedule_work(&mac->associnfo.work);
+ spin_unlock_irqrestore(&mac->lock, flags);
+
+ return 0;
@@ -1305,7 +1315,7 @@
+}
diff --git a/net/ieee80211/softmac/ieee80211softmac_io.c b/net/ieee80211/softmac/ieee80211softmac_io.c
new file mode 100644
-index 0000000..a142dae
+index 0000000..febc51d
--- /dev/null
+++ b/net/ieee80211/softmac/ieee80211softmac_io.c
@@ -0,0 +1,474 @@
@@ -1619,7 +1629,7 @@
+{
+ /* Allocate Packet */
+ (*pkt) = (struct ieee80211_disassoc *)ieee80211softmac_alloc_mgt(2);
-+ if (unlikely(pkt == NULL))
++ if (unlikely((*pkt) == NULL))
+ return 0;
+ ieee80211softmac_hdr_3addr(mac, &((*pkt)->header), type, net->bssid, net->bssid);
+ /* Reason */
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -r1.262 -r1.263
--- sources 11 Jan 2006 00:01:30 -0000 1.262
+++ sources 11 Jan 2006 13:04:21 -0000 1.263
@@ -1,3 +1,4 @@
cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2
-1e8dda938d8fb06863d7276b79d6e544 bcm43xx-20060106.tar.bz2
-0ec61ec3ed52b5aa640cacd23338e0ea patch-2.6.15-git6a.bz2
+e7291436e5d71b575dea034883cb42e5 bcm43xx-20060111.tar.bz2
+9bf813fab546b5a25cb9b59ce086c4b7 patch-2.6.15-git7.bz2
+
--- linux-2.6-bcm43xx-resume.patch DELETED ---
More information about the fedora-cvs-commits
mailing list