rpms/kernel/devel git-wireless-dev.patch, 1.6, 1.7 kernel-2.6.spec, 1.3111, 1.3112 linux-2.6-bcm43xx-mac80211-phy-rev-1-fix.patch, 1.3, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Apr 25 18:07:05 UTC 2007
Author: linville
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3496
Modified Files:
git-wireless-dev.patch kernel-2.6.spec
Removed Files:
linux-2.6-bcm43xx-mac80211-phy-rev-1-fix.patch
Log Message:
update git-wireless-dev.patch
git-wireless-dev.patch:
.mailmap | 1
CREDITS | 37
Documentation/feature-removal-schedule.txt | 11
MAINTAINERS | 60
drivers/Kconfig | 2
drivers/Makefile | 1
drivers/misc/Kconfig | 8
drivers/misc/Makefile | 1
drivers/misc/eeprom_93cx6.c | 347 +
drivers/net/Makefile | 2
drivers/net/wireless/Kconfig | 120
drivers/net/wireless/Makefile | 3
drivers/net/wireless/bcm43xx/Kconfig | 4
drivers/net/wireless/hostap/Kconfig | 3
drivers/net/wireless/mac80211/Kconfig | 6
drivers/net/wireless/mac80211/Makefile | 6
drivers/net/wireless/mac80211/README | 2
drivers/net/wireless/mac80211/adm8211/Kconfig | 25
drivers/net/wireless/mac80211/adm8211/Makefile | 1
drivers/net/wireless/mac80211/adm8211/adm8211.c | 2172 ++++++
drivers/net/wireless/mac80211/adm8211/adm8211.h | 622 +
drivers/net/wireless/mac80211/bcm43xx/Kconfig | 101
drivers/net/wireless/mac80211/bcm43xx/Makefile | 18
drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h | 885 ++
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.c | 433 +
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.h | 110
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.c | 1383 ++++
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.h | 361 +
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.c | 300
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.h | 56
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.c | 1110 +++
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.h | 92
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c | 4029 ++++++++++++
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.h | 156
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.c | 163
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.h | 22
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c | 4286 +++++++++++++
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.h | 309
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.c | 671 ++
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.h | 170
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.c | 82
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.h | 41
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.c | 232
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.h | 9
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.c | 376 +
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.h | 28
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.c | 603 +
drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.h | 250
drivers/net/wireless/mac80211/p54/Kconfig | 10
drivers/net/wireless/mac80211/p54/Makefile | 4
drivers/net/wireless/mac80211/p54/net2280.h | 452 +
drivers/net/wireless/mac80211/p54/prism54.h | 77
drivers/net/wireless/mac80211/p54/prism54common.c | 821 ++
drivers/net/wireless/mac80211/p54/prism54common.h | 328 +
drivers/net/wireless/mac80211/p54/prism54magic.h | 77
drivers/net/wireless/mac80211/p54/prism54pci.c | 700 ++
drivers/net/wireless/mac80211/p54/prism54pci.h | 106
drivers/net/wireless/mac80211/p54/prism54usb.c | 946 ++
drivers/net/wireless/mac80211/p54/prism54usb.h | 133
drivers/net/wireless/mac80211/rt2x00/Kconfig | 99
drivers/net/wireless/mac80211/rt2x00/Makefile | 12
drivers/net/wireless/mac80211/rt2x00/rt2400pci.c | 2562 ++++++++
drivers/net/wireless/mac80211/rt2x00/rt2400pci.h | 925 ++
drivers/net/wireless/mac80211/rt2x00/rt2500pci.c | 2859 ++++++++
drivers/net/wireless/mac80211/rt2x00/rt2500pci.h | 1192 +++
drivers/net/wireless/mac80211/rt2x00/rt2500usb.c | 2695 ++++++++
drivers/net/wireless/mac80211/rt2x00/rt2500usb.h | 740 ++
drivers/net/wireless/mac80211/rt2x00/rt2x00.h | 1070 +++
drivers/net/wireless/mac80211/rt2x00/rt2x00debug.c | 354 +
drivers/net/wireless/mac80211/rt2x00/rt2x00debug.h | 71
drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c | 282
drivers/net/wireless/mac80211/rt2x00/rt2x00lib.h | 80
drivers/net/wireless/mac80211/rt2x00/rt2x00mac.c | 540 +
drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h | 39
drivers/net/wireless/mac80211/rt2x00/rt2x00usb.h | 82
drivers/net/wireless/mac80211/rt2x00/rt61pci.c | 3333 ++++++++++
drivers/net/wireless/mac80211/rt2x00/rt61pci.h | 1355 ++++
drivers/net/wireless/mac80211/rt2x00/rt73usb.c | 2993 +++++++++
drivers/net/wireless/mac80211/rt2x00/rt73usb.h | 939 ++
drivers/net/wireless/mac80211/rtl818x/Kconfig | 9
drivers/net/wireless/mac80211/rtl818x/Makefile | 2
drivers/net/wireless/mac80211/rtl818x/rtl8187.h | 126
drivers/net/wireless/mac80211/rtl818x/rtl8187_dev.c | 726 ++
drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.c | 747 ++
drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.h | 30
drivers/net/wireless/mac80211/rtl818x/rtl818x.h | 180
drivers/net/wireless/mac80211/zd1211rw/Kconfig | 19
drivers/net/wireless/mac80211/zd1211rw/Makefile | 11
drivers/net/wireless/mac80211/zd1211rw/zd_chip.c | 1679 +++++
drivers/net/wireless/mac80211/zd1211rw/zd_chip.h | 910 ++
drivers/net/wireless/mac80211/zd1211rw/zd_def.h | 57
drivers/net/wireless/mac80211/zd1211rw/zd_ieee80211.h | 67
drivers/net/wireless/mac80211/zd1211rw/zd_mac.c | 700 ++
drivers/net/wireless/mac80211/zd1211rw/zd_mac.h | 250
drivers/net/wireless/mac80211/zd1211rw/zd_rf.c | 170
drivers/net/wireless/mac80211/zd1211rw/zd_rf.h | 80
drivers/net/wireless/mac80211/zd1211rw/zd_rf_al2230.c | 436 +
drivers/net/wireless/mac80211/zd1211rw/zd_rf_al7230b.c | 491 +
drivers/net/wireless/mac80211/zd1211rw/zd_rf_rf2959.c | 279
drivers/net/wireless/mac80211/zd1211rw/zd_usb.c | 1337 ++++
drivers/net/wireless/mac80211/zd1211rw/zd_usb.h | 241
drivers/net/wireless/mac80211/zd1211rw/zd_util.c | 82
drivers/net/wireless/mac80211/zd1211rw/zd_util.h | 29
drivers/net/wireless/zd1211rw/Kconfig | 4
drivers/ssb/Kconfig | 93
drivers/ssb/Makefile | 11
drivers/ssb/driver_chipcommon.c | 402 +
drivers/ssb/driver_mipscore.c | 258
drivers/ssb/driver_pcicore.c | 556 +
drivers/ssb/main.c | 1047 +++
drivers/ssb/pci.c | 672 ++
drivers/ssb/pcihost_wrapper.c | 104
drivers/ssb/pcmcia.c | 256
drivers/ssb/scan.c | 407 +
drivers/ssb/ssb_private.h | 151
drivers/usb/host/Kconfig | 13
drivers/usb/host/ohci-hcd.c | 21
drivers/usb/host/ohci-ssb.c | 254
include/linux/Kbuild | 2
include/linux/crc-itu-t.h | 27
include/linux/eeprom_93cx6.h | 77
include/linux/ieee80211.h | 403 +
include/linux/netdevice.h | 7
include/linux/nl80211.h | 301
include/linux/ssb/ssb.h | 403 +
include/linux/ssb/ssb_driver_chipcommon.h | 387 +
include/linux/ssb/ssb_driver_extif.h | 163
include/linux/ssb/ssb_driver_mips.h | 47
include/linux/ssb/ssb_driver_pci.h | 108
include/linux/ssb/ssb_regs.h | 294
include/net/cfg80211.h | 154
include/net/iw_handler.h | 13
include/net/mac80211.h | 1103 +++
include/net/wireless.h | 159
lib/Kconfig | 8
lib/Makefile | 1
lib/crc-itu-t.c | 64
net/Kconfig | 12
net/Makefile | 2
net/core/Makefile | 1
net/core/dev.c | 33
net/core/rtnetlink.c | 31
net/core/wireless.c | 2371 -------
net/ieee80211/Kconfig | 3
net/mac80211/Kconfig | 81
net/mac80211/Makefile | 21
net/mac80211/aes_ccm.c | 155
net/mac80211/aes_ccm.h | 26
net/mac80211/debugfs.c | 436 +
net/mac80211/debugfs.h | 16
net/mac80211/debugfs_key.c | 253
net/mac80211/debugfs_key.h | 34
net/mac80211/debugfs_netdev.c | 440 +
net/mac80211/debugfs_netdev.h | 30
net/mac80211/debugfs_sta.c | 247
net/mac80211/debugfs_sta.h | 12
net/mac80211/hostapd_ioctl.h | 347 +
net/mac80211/ieee80211.c | 5102 ++++++++++++++++
net/mac80211/ieee80211_cfg.c | 75
net/mac80211/ieee80211_cfg.h | 9
net/mac80211/ieee80211_common.h | 98
net/mac80211/ieee80211_i.h | 854 ++
net/mac80211/ieee80211_iface.c | 366 +
net/mac80211/ieee80211_ioctl.c | 3290 ++++++++++
net/mac80211/ieee80211_key.h | 106
net/mac80211/ieee80211_led.c | 91
net/mac80211/ieee80211_led.h | 32
net/mac80211/ieee80211_rate.c | 140
net/mac80211/ieee80211_rate.h | 144
net/mac80211/ieee80211_scan.c | 344 +
net/mac80211/ieee80211_sta.c | 3202 ++++++++++
net/mac80211/michael.c | 104
net/mac80211/michael.h | 20
net/mac80211/rc80211_simple.c | 432 +
net/mac80211/sta_info.c | 463 +
net/mac80211/sta_info.h | 167
net/mac80211/tkip.c | 341 +
net/mac80211/tkip.h | 36
net/mac80211/wep.c | 328 +
net/mac80211/wep.h | 40
net/mac80211/wme.c | 685 ++
net/mac80211/wme.h | 38
net/mac80211/wpa.c | 846 ++
net/mac80211/wpa.h | 31
net/wireless/Kconfig | 46
net/wireless/Makefile | 17
net/wireless/core.c | 359 +
net/wireless/core.h | 80
net/wireless/nl80211.c | 993 +++
net/wireless/nl80211.h | 24
net/wireless/sysfs.c | 130
net/wireless/sysfs.h | 9
net/wireless/wext-common.c | 663 ++
net/wireless/wext-compat.c | 789 ++
net/wireless/wext-export.c | 29
net/wireless/wext-mod.c | 20
net/wireless/wext-old.c | 829 ++
net/wireless/wext.h | 51
198 files changed, 85649 insertions(+), 2539 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.6 -r 1.7 git-wireless-dev.patch
Index: git-wireless-dev.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/git-wireless-dev.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- git-wireless-dev.patch 13 Apr 2007 20:44:49 -0000 1.6
+++ git-wireless-dev.patch 25 Apr 2007 18:07:00 -0000 1.7
@@ -1,13078 +1,13118 @@
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-dev.git
-commit 5363171f929bc62290a1119e492f3ae7d9636c5e
+commit 6295da8ac8ad909dbe49d4c02ee9902fbdb04704
-diff --git a/.mailmap b/.mailmap
-index bf62dbe..5662cc7 100644
---- a/.mailmap
-+++ b/.mailmap
-@@ -57,6 +57,7 @@ Jean Tourrilhes <jt at hpl.hp.com>
- Jeff Garzik <jgarzik at pretzel.yyz.us>
- Jens Axboe <axboe at suse.de>
- Jens Osterkamp <Jens.Osterkamp at de.ibm.com>
-+Johannes Berg <johannes at sipsolutions.net>
- John Stultz <johnstul at us.ibm.com>
- Juha Yrjola <at solidboot.com>
- Juha Yrjola <juha.yrjola at nokia.com>
-diff --git a/CREDITS b/CREDITS
-index 6bd8ab8..f95e8af 100644
---- a/CREDITS
-+++ b/CREDITS
-@@ -317,6 +317,12 @@ S: 2322 37th Ave SW
- S: Seattle, Washington 98126-2010
- S: USA
-
-+N: Johannes Berg
-+E: johannes at sipsolutions.net
-+W: http://johannes.sipsolutions.net/
-+P: 1024D/9AB78CA5 AD02 0176 4E29 C137 1DF6 08D2 FC44 CF86 9AB7 8CA5
-+D: powerpc & 802.11 hacker
-+
- N: Stephen R. van den Berg (AKA BuGless)
- E: berg at pool.informatik.rwth-aachen.de
- D: General kernel, gcc, and libc hacker
-@@ -659,6 +665,11 @@ D: Minor updates to SCSI code for the Co
- S: (ask for current address)
- S: USA
-
-+N: Robin Cornelius
-+E: robincornelius at users.sourceforge.net
-+D: Ralink rt2x00 WLAN driver
-+S: Cornwall, U.K.
-+
- N: Mark Corner
- E: mcorner at umich.edu
- W: http://www.eecs.umich.edu/~mcorner/
-@@ -673,6 +684,11 @@ D: Kernel module SMART utilities
- S: Santa Cruz, California
- S: USA
-
-+N: Luis Correia
-+E: lfcorreia at users.sf.net
-+D: Ralink rt2x00 WLAN driver
-+S: Belas, Portugal
-+
- N: Alan Cox
- W: http://www.linux.org.uk/diary/
- D: Linux Networking (0.99.10->2.0.29)
-@@ -827,6 +843,12 @@ S: Lancs
- S: PR4 6AX
- S: United Kingdom
-
-+N: Ivo van Doorn
-+E: IvDoorn at gmail.com
-+W: http://www.mendiosus.nl
-+D: Ralink rt2x00 WLAN driver
-+S: Haarlem, The Netherlands
-+
- N: John G Dorsey
- E: john+ at cs.cmu.edu
- D: ARM Linux ports to Assabet/Neponset, Spot
-@@ -3510,6 +3532,12 @@ S: Maastrichterweg 63
- S: 5554 GG Valkenswaard
- S: The Netherlands
-
-+N: Mark Wallis
-+E: mwallis at serialmonkey.com
-+W: http://mark.serialmonkey.com
-+D: Ralink rt2x00 WLAN driver
-+S: Newcastle, Australia
-+
- N: Peter Shaobo Wang
- E: pwang at mmdcorp.com
- W: http://www.mmdcorp.com/pw/linux
-@@ -3644,6 +3672,15 @@ S: Alte Regensburger Str. 11a
- S: 93149 Nittenau
- S: Germany
-
-+N: Gertjan van Wingerde
-+E: gwingerde at home.nl
-+D: Ralink rt2x00 WLAN driver
-+D: Minix V2 file-system
-+D: Misc fixes
-+S: Geessinkweg 177
-+S: 7544 TX Enschede
-+S: The Netherlands
-+
- N: Lars Wirzenius
- E: liw at iki.fi
- D: Linux System Administrator's Guide, author, former maintainer
-diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
-index 0bc8b0b..0f7a323 100644
---- a/Documentation/feature-removal-schedule.txt
-+++ b/Documentation/feature-removal-schedule.txt
-@@ -305,18 +305,6 @@ Who: Richard Purdie <rpurdie at rpsys.net>
-
- ---------------------------
-
--What: Wireless extensions over netlink (CONFIG_NET_WIRELESS_RTNETLINK)
--When: with the merge of wireless-dev, 2.6.22 or later
--Why: The option/code is
-- * not enabled on most kernels
-- * not required by any userspace tools (except an experimental one,
-- and even there only for some parts, others use ioctl)
-- * pointless since wext is no longer evolving and the ioctl
-- interface needs to be kept
--Who: Johannes Berg <johannes at sipsolutions.net>
--
-----------------------------
--
- What: i8xx_tco watchdog driver
- When: in 2.6.22
- Why: the i8xx_tco watchdog driver has been replaced by the iTCO_wdt
-diff --git a/MAINTAINERS b/MAINTAINERS
-index 829407f..233ba0d 100644
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -296,6 +296,14 @@ M: corentin.labbe at geomatys.fr
- L: lm-sensors at lm-sensors.org
- S: Maintained
-
-+ADM8211 WIRELESS DRIVER
-+P: Michael Wu
-+M: flamingice at sourmilk.net
-+L: linux-wireless at vger.kernel.org
-+W: http://aluminum.sourmilk.net/adm8211/
-+T: git kernel.org:/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git
-+S: Maintained
+--- /dev/null 2007-04-17 21:17:54.747954992 -0400
++++ linux-2.6.20.noarch/include/net/wireless.h 2007-04-25 11:20:17.000000000 -0400
+@@ -0,0 +1,159 @@
++#ifndef __NET_WIRELESS_H
++#define __NET_WIRELESS_H
+
- ADT746X FAN DRIVER
- P: Colin Leroy
- M: colin at colino.net
-@@ -656,6 +664,7 @@ S: Supported
- ATMEL WIRELESS DRIVER
- P: Simon Kelley
- M: simon at thekelleys.org.uk
-+L: linux-wireless at vger.kernel.org
- W: http://www.thekelleys.org.uk/atmel
- W: http://atmelwlandriver.sourceforge.net/
- S: Maintained
-@@ -706,11 +715,21 @@ L: linux-hams at vger.kernel.org
- W: http://www.baycom.org/~tom/ham/ham.html
- S: Maintained
-
-+BCM43XX WIRELESS DRIVER (DEVICESCAPE BASED VERSION)
-+P: Michael Buesch
-+M: mb at bu3sch.de
-+P: Stefano Brivio
-+M: st3 at riseup.net
-+L: linux-wireless at vger.kernel.org
-+W: http://bcm43xx.berlios.de/
-+S: Maintained
++/*
++ * 802.11 device management
++ *
++ * Copyright 2007 Johannes Berg <johannes at sipsolutions.net>
++ */
+
- BCM43XX WIRELESS DRIVER (SOFTMAC BASED VERSION)
- P: Larry Finger
- M: Larry.Finger at lwfinger.net
- P: Stefano Brivio
- M: st3 at riseup.net
-+L: linux-wireless at vger.kernel.org
- W: http://bcm43xx.berlios.de/
- S: Maintained
-
-@@ -892,6 +911,12 @@ M: maxextreme at gmail.com
- L: linux-kernel at vger.kernel.org
- S: Maintained
-
-+CFG80211 and NL80211
-+P: Johannes Berg
-+M: johannes at sipsolutions.net
-+L: linux-wireless at vger.kernel.org
-+S: Maintained
[...146205 lines suppressed...]
-+ 2 * sizeof(struct iw_quality));
++ if (sdata->type != IEEE80211_IF_TYPE_STA &&
++ sdata->type != IEEE80211_IF_TYPE_IBSS)
++ return -EINVAL;
+
++ ieee80211_send_deauth(dev, ifsta, reason);
++ ieee80211_set_disassoc(dev, ifsta, 1);
+ return 0;
+}
-+EXPORT_SYMBOL(iw_handler_get_thrspy);
+
-+/*------------------------------------------------------------------*/
-+/*
-+ * Prepare and send a Spy Threshold event
-+ */
-+static void iw_send_thrspy_event(struct net_device * dev,
-+ struct iw_spy_data * spydata,
-+ unsigned char * address,
-+ struct iw_quality * wstats)
-+{
-+ union iwreq_data wrqu;
-+ struct iw_thrspy threshold;
-+
-+ /* Init */
-+ wrqu.data.length = 1;
-+ wrqu.data.flags = 0;
-+ /* Copy address */
-+ memcpy(threshold.addr.sa_data, address, ETH_ALEN);
-+ threshold.addr.sa_family = ARPHRD_ETHER;
-+ /* Copy stats */
-+ memcpy(&(threshold.qual), wstats, sizeof(struct iw_quality));
-+ /* Copy also thresholds */
-+ memcpy(&(threshold.low), &(spydata->spy_thr_low),
-+ 2 * sizeof(struct iw_quality));
-+
-+ /* Send event to user space */
-+ wireless_send_event(dev, SIOCGIWTHRSPY, &wrqu, (char *) &threshold);
-+}
+
-+/* ---------------------------------------------------------------- */
-+/*
-+ * Call for the driver to update the spy data.
-+ * For now, the spy data is a simple array. As the size of the array is
-+ * small, this is good enough. If we wanted to support larger number of
-+ * spy addresses, we should use something more efficient...
-+ */
-+void wireless_spy_update(struct net_device * dev,
-+ unsigned char * address,
-+ struct iw_quality * wstats)
++int ieee80211_sta_disassociate(struct net_device *dev, u16 reason)
+{
-+ struct iw_spy_data * spydata = get_spydata(dev);
-+ int i;
-+ int match = -1;
++ struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
++ struct ieee80211_if_sta *ifsta = &sdata->u.sta;
+
-+ /* Make sure driver is not buggy or using the old API */
-+ if(!spydata)
-+ return;
++ printk(KERN_DEBUG "%s: disassociate(reason=%d)\n",
++ dev->name, reason);
+
-+ /* Update all records that match */
-+ for(i = 0; i < spydata->spy_number; i++)
-+ if(!compare_ether_addr(address, spydata->spy_address[i])) {
-+ memcpy(&(spydata->spy_stat[i]), wstats,
-+ sizeof(struct iw_quality));
-+ match = i;
-+ }
++ if (sdata->type != IEEE80211_IF_TYPE_STA)
++ return -EINVAL;
+
-+ /* Generate an event if we cross the spy threshold.
-+ * To avoid event storms, we have a simple hysteresis : we generate
-+ * event only when we go under the low threshold or above the
-+ * high threshold. */
-+ if(match >= 0) {
-+ if(spydata->spy_thr_under[match]) {
-+ if(wstats->level > spydata->spy_thr_high.level) {
-+ spydata->spy_thr_under[match] = 0;
-+ iw_send_thrspy_event(dev, spydata,
-+ address, wstats);
-+ }
-+ } else {
-+ if(wstats->level < spydata->spy_thr_low.level) {
-+ spydata->spy_thr_under[match] = 1;
-+ iw_send_thrspy_event(dev, spydata,
-+ address, wstats);
-+ }
-+ }
-+ }
++ if (!ifsta->associated)
++ return -1;
++
++ ieee80211_send_disassoc(dev, ifsta, reason);
++ ieee80211_set_disassoc(dev, ifsta, 0);
++ return 0;
+}
-+EXPORT_SYMBOL(wireless_spy_update);
-diff --git a/net/wireless/wext.h b/net/wireless/wext.h
-new file mode 100644
-index 0000000..ced6667
---- /dev/null
-+++ b/net/wireless/wext.h
-@@ -0,0 +1,51 @@
+--- /dev/null 2007-04-17 21:17:54.747954992 -0400
++++ linux-2.6.20.noarch/net/mac80211/ieee80211_cfg.h 2007-04-25 11:20:17.000000000 -0400
+@@ -0,0 +1,9 @@
+/*
-+ * some foo for wext compat/wext interoperability
++ * mac80211 configuration hooks for cfg80211
+ */
-+#ifndef _WEXT_H
-+#define _WEXT_H
-+#include <linux/netdevice.h>
-+#include <linux/if.h>
-+#include <linux/wireless.h>
-+#include <net/iw_handler.h>
-+
-+/* wext compatibility must be compiled in...
-+ * this extern is in wext-compat.c */
-+struct cfg80211_ioctl_ops {
-+ /* used to make sure the module isn't going away
-+ * can't really happen, except if no driver has cfg80211
-+ * in use, but in that case */
-+ struct module *module;
-+
-+ /* and finally this is used to do work */
-+ int (*do_wext_ioctl)(struct ifreq *ifr, unsigned int cmd);
-+};
-+extern struct cfg80211_ioctl_ops cfg80211_ioctl_ops;
-+
++#ifndef __IEEE80211_CFG_H
++#define __IEEE80211_CFG_H
+
-+struct iw_statistics *get_wireless_stats(struct net_device *dev,
-+ struct iw_statistics *out);
-+int wireless_process_ioctl(struct ifreq *ifr, unsigned int cmd);
++extern struct cfg80211_ops mac80211_config_ops;
+
-+int cfg80211_wext_ioctl(struct ifreq *ifr, unsigned int cmd);
-+#ifdef CFG80211_MODULE
-+int call_cfg80211_wext_ioctl(struct ifreq *ifr, unsigned int cmd);
-+#else
-+#define call_cfg80211_wext_ioctl cfg80211_wext_ioctl
-+#endif
++#endif /* __IEEE80211_CFG_H */
+--- /dev/null 2007-04-17 21:17:54.747954992 -0400
++++ linux-2.6.20.noarch/net/mac80211/debugfs.h 2007-04-25 11:20:17.000000000 -0400
+@@ -0,0 +1,16 @@
++#ifndef __MAC80211_DEBUGFS_H
++#define __MAC80211_DEBUGFS_H
+
-+#if defined(CONFIG_CFG80211_WEXT_COMPAT) && defined(CFG80211_MODULE)
-+int cfg80211_wext_init(void);
-+void cfg80211_wext_exit(void);
++#ifdef CONFIG_MAC80211_DEBUGFS
++extern void debugfs_hw_add(struct ieee80211_local *local);
++extern void debugfs_hw_del(struct ieee80211_local *local);
++extern int mac80211_open_file_generic(struct inode *inode, struct file *file);
+#else
-+static inline int cfg80211_wext_init(void)
++static inline void debugfs_hw_add(struct ieee80211_local *local)
+{
-+ return 0;
++ return;
+}
-+static inline void cfg80211_wext_exit(void) {}
++static inline void debugfs_hw_del(struct ieee80211_local *local) {}
+#endif
+
-+extern const struct iw_ioctl_description wext_standard_ioctl[];
-+extern const unsigned wext_standard_ioctl_num;
-+extern const struct iw_ioctl_description standard_event[];
-+extern const int event_type_size[];
-+#endif /* _WEXT_H */
++#endif /* __MAC80211_DEBUGFS_H */
+--- linux-2.6.20.noarch/net/ieee80211/Kconfig.orig 2007-04-25 11:19:13.000000000 -0400
++++ linux-2.6.20.noarch/net/ieee80211/Kconfig 2007-04-25 11:20:17.000000000 -0400
+@@ -56,7 +56,8 @@ config IEEE80211_CRYPT_CCMP
+
+ config IEEE80211_CRYPT_TKIP
+ tristate "IEEE 802.11i TKIP encryption"
+- depends on IEEE80211 && NET_RADIO
++ depends on IEEE80211
++ select WIRELESS_EXT
+ select CRYPTO
+ select CRYPTO_MICHAEL_MIC
+ select CRYPTO_ECB
+--- linux-2.6.20.noarch/.mailmap.orig 2007-04-25 11:19:13.000000000 -0400
++++ linux-2.6.20.noarch/.mailmap 2007-04-25 11:20:17.000000000 -0400
+@@ -57,6 +57,7 @@ Jean Tourrilhes <jt at hpl.hp.com>
+ Jeff Garzik <jgarzik at pretzel.yyz.us>
+ Jens Axboe <axboe at suse.de>
+ Jens Osterkamp <Jens.Osterkamp at de.ibm.com>
++Johannes Berg <johannes at sipsolutions.net>
+ John Stultz <johnstul at us.ibm.com>
+ Juha Yrjola <at solidboot.com>
+ Juha Yrjola <juha.yrjola at nokia.com>
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3111
retrieving revision 1.3112
diff -u -r1.3111 -r1.3112
--- kernel-2.6.spec 25 Apr 2007 16:27:58 -0000 1.3111
+++ kernel-2.6.spec 25 Apr 2007 18:07:02 -0000 1.3112
@@ -599,8 +599,7 @@
Patch2300: git-wireless-dev.patch
Patch2301: git-iwlwifi.patch
Patch2302: git-iwlwifi-fixes.patch
-Patch2303: linux-2.6-bcm43xx-mac80211-phy-rev-1-fix.patch
-Patch2304: linux-2.6-zd1211rw-mac80211-queue-limit.patch
+Patch2303: linux-2.6-zd1211rw-mac80211-queue-limit.patch
# ACPI bits
@@ -1343,10 +1342,8 @@
%patch2301 -p1
# ...plus some fixes not yet in Intel's tree
%patch2302 -p1
-# fix oops on ppc for bcm43xx-mac80211 w/ phy rev 1
-%patch2303 -p1
# limite queueing of URBs to zd1211rw-mac80211 driver
-%patch2304 -p1
+%patch2303 -p1
# ACPI patches
@@ -2336,6 +2333,10 @@
# - tux.
%changelog
+* Wed Apr 25 2007 John W. Linville <linville at redhat.com>
+- Update git-wireless-dev.patch
+- Remove linux-2.6-bcm43xx-mac80211-phy-rev-1-fix.patch (obsoleted by above)
+
* Wed Apr 25 2007 Dave Jones <davej at redhat.com>
- 2.6.21-rc7-git8
--- linux-2.6-bcm43xx-mac80211-phy-rev-1-fix.patch DELETED ---
More information about the fedora-cvs-commits
mailing list