rpms/kernel/F-9 kernel.spec, 1.694, 1.695 linux-2.6-wireless.patch, 1.41, 1.42
John W. Linville (linville)
fedora-extras-commits at redhat.com
Fri Jun 27 19:35:35 UTC 2008
- Previous message: rpms/liferea/devel .cvsignore, 1.72, 1.73 liferea.spec, 1.113, 1.114 sources, 1.73, 1.74
- Next message: rpms/kernel/F-8 kernel.spec, 1.479, 1.480 linux-2.6-wireless.patch, 1.43, 1.44
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: linville
Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7239
Modified Files:
kernel.spec linux-2.6-wireless.patch
Log Message:
Upstream wireless fixes from 2008-06-27
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.694
retrieving revision 1.695
diff -u -r1.694 -r1.695
--- kernel.spec 27 Jun 2008 18:52:51 -0000 1.694
+++ kernel.spec 27 Jun 2008 19:34:18 -0000 1.695
@@ -1858,6 +1858,10 @@
%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
%changelog
+* Fri Jun 27 2008 John W. Linville <linville at redhat.com> 2.6.25.9-76
+- Upstream wireless fixes from 2008-06-27
+ (http://marc.info/?l=linux-wireless&m=121459423021061&w=2)
+
* Fri Jun 27 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.9-75
- Fix bluetooth keyboard disconnect (#449872)
linux-2.6-wireless.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.41 -r 1.42 linux-2.6-wireless.patch
Index: linux-2.6-wireless.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-wireless.patch,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- linux-2.6-wireless.patch 25 Jun 2008 19:29:30 -0000 1.41
+++ linux-2.6-wireless.patch 27 Jun 2008 19:34:18 -0000 1.42
@@ -1,3 +1,53 @@
+commit 00eb7fe77eb455f807c396f9917f0f623d4c84bb
+Author: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
+Date: Thu Jun 26 12:13:46 2008 +0300
+
+ mac80211: fix an oops in several failure paths in key allocation
+
+ This patch fixes an oops in several failure paths in key allocation. This
+ Oops occurs when freeing a key that has not been linked yet, so the
+ key->sdata is not set.
+
+ Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
+ Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
+ Acked-by: Johannes Berg <johannes at sipsolutions.net>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 5f4a6fae46a214c4dce3bd63a6219a5f1c818c78
+Author: Harvey Harrison <harvey.harrison at gmail.com>
+Date: Wed Jun 25 14:20:37 2008 -0700
+
+ prism: islpci_eth.c endianness fix
+
+ clock is already cpu-endian (see le32_to_cpu slightly before), so
+ le64_to_cpu doesn't make much sense.
+
+ Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 980dfcb93232907034a2c92d62d3a7d6ac7bef44
+Author: Ivo van Doorn <ivdoorn at gmail.com>
+Date: Wed Jun 25 21:27:00 2008 +0200
+
+ rt2x00: Fix lock dependency errror
+
+ This fixes a circular locking dependency in the workqueue handling.
+ The interface work task uses the mac80211 function
+ ieee80211_iterate_active_interfaces() which grabs the RTNL lock.
+
+ However when the interface is brough down, this happens under the RTNL
+ lock as well, this causes problems because mac80211 will flush the workqueue
+ during the ifdown event. This causes mac80211 to wait until the driver has
+ completed all work which can't finish because it is waiting on the RTNL lock.
+
+ This is fixed by moving rt2x00 workqueue tasks on a different workqueue,
+ this workqueue can be flushed when the ieee80211_hw structure is removed
+ by the driver (when the driver is unloaded) which does not happen under the
+ RTNL lock.
+
+ Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
commit 66b5004d85164a6439d3ba1e7757734472ee2cac
Author: Ron Rindjunsky <ron.rindjunsky at intel.com>
Date: Wed Jun 25 16:46:31 2008 +0800
@@ -9128,8 +9178,8 @@
Signed-off-by: John W. Linville <linville at tuxdriver.com>
diff -up linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig linux-2.6.25.noarch/drivers/net/wireless/adm8211.c
---- linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig 2008-06-25 14:35:03.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-06-25 14:35:20.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig 2008-06-27 15:17:11.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-06-27 15:17:27.000000000 -0400
@@ -48,6 +48,32 @@ static struct pci_device_id adm8211_pci_
{ 0 }
};
@@ -9327,8 +9377,8 @@
err = ieee80211_register_hw(dev);
if (err) {
diff -up linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig linux-2.6.25.noarch/drivers/net/wireless/adm8211.h
---- linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig 2008-06-25 14:35:03.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-06-25 14:35:20.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig 2008-06-27 15:17:11.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-06-27 15:17:27.000000000 -0400
@@ -534,61 +534,6 @@ struct adm8211_eeprom {
u8 cis_data[0]; /* 0x80, 384 bytes */
} __attribute__ ((packed));
@@ -9416,8 +9466,8 @@
{1, 11}, /* FCC */
{1, 11}, /* IC */
diff -up linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig linux-2.6.25.noarch/drivers/net/wireless/airo.c
---- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-06-25 14:35:03.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-06-25 14:35:20.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-06-27 15:17:11.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-06-27 15:17:27.000000000 -0400
@@ -2668,6 +2668,7 @@ static struct net_device *init_wifidev(s
dev->irq = ethdev->irq;
dev->base_addr = ethdev->base_addr;
@@ -9672,8 +9722,8 @@
/*
diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h
---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h.orig 2008-06-25 14:35:03.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h 2008-06-25 14:35:20.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h.orig 2008-06-27 15:17:11.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h 2008-06-27 15:17:27.000000000 -0400
@@ -30,7 +30,6 @@
#include <net/mac80211.h>
@@ -10023,8 +10073,8 @@
extern int ath5k_hw_get_capability(struct ath5k_hw *ah, enum ath5k_capability_type cap_type, u32 capability, u32 *result);
diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c
---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-06-25 14:35:03.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-06-25 14:35:20.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-06-27 15:17:11.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-06-27 15:17:27.000000000 -0400
@@ -58,10 +58,6 @@
#include "reg.h"
#include "debug.h"
@@ -11078,8 +11128,8 @@
memcpy(stats, &sc->ll_stats, sizeof(sc->ll_stats));
diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h
---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-06-25 14:35:03.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h 2008-06-25 14:35:20.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-06-27 15:17:11.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h 2008-06-27 15:17:27.000000000 -0400
@@ -83,7 +83,7 @@ struct ath5k_txq {
#if CHAN_DEBUG
#define ATH_CHAN_MAX (26+26+26+200+200)
@@ -11125,8 +11175,8 @@
#define ath5k_hw_hasbssidmask(_ah) \
diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c
---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c.orig 2008-06-25 14:35:03.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c 2008-06-25 14:35:20.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c.orig 2008-06-27 15:17:11.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c 2008-06-27 15:17:27.000000000 -0400
@@ -65,7 +65,7 @@ static unsigned int ath5k_debug;
module_param_named(debug, ath5k_debug, uint, 0);
@@ -11301,8 +11351,8 @@
-#endif /* if ATH5K_DEBUG */
+#endif /* ifdef CONFIG_ATH5K_DEBUG */
diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h
---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h.orig 2008-06-25 14:35:03.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h 2008-06-25 14:35:20.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h.orig 2008-06-27 15:17:11.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h 2008-06-27 15:17:27.000000000 -0400
@@ -61,11 +61,6 @@
#ifndef _ATH5K_DEBUG_H
#define _ATH5K_DEBUG_H
@@ -11387,8 +11437,8 @@
#endif /* ifndef _ATH5K_DEBUG_H */
diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c
---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c.orig 2008-06-25 14:35:03.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c 2008-06-25 14:35:20.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c.orig 2008-06-27 15:17:11.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c 2008-06-27 15:17:27.000000000 -0400
@@ -1,4 +1,4 @@
- /*
+/*
@@ -12983,8 +13033,8 @@
/****************\
diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h
---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h.orig 2008-06-25 14:35:03.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h 2008-06-25 14:35:20.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h.orig 2008-06-27 15:17:11.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h 2008-06-27 15:17:27.000000000 -0400
@@ -173,7 +173,10 @@ struct ath5k_eeprom_info {
* (rX: reserved fields possibily used by future versions of the ar5k chipset)
*/
@@ -13186,8 +13236,8 @@
*/
diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c
---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c.orig 2008-06-25 14:35:03.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c 2008-06-25 14:35:20.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c.orig 2008-06-27 15:17:11.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c 2008-06-27 15:17:27.000000000 -0400
@@ -678,8 +678,8 @@ static const struct ath5k_ini ar5212_ini
{ AR5K_PHY(644), 0x00806333 },
{ AR5K_PHY(645), 0x00106c10 },
@@ -13710,8 +13760,8 @@
}
diff -up /dev/null linux-2.6.25.noarch/drivers/net/wireless/ath5k/Kconfig
---- /dev/null 2008-06-25 08:17:03.992002591 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Kconfig 2008-06-25 14:35:20.000000000 -0400
+--- /dev/null 2008-06-26 08:31:46.303004729 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Kconfig 2008-06-27 15:17:27.000000000 -0400
@@ -0,0 +1,37 @@
+config ATH5K
+ tristate "Atheros 5xxx wireless cards support"
@@ -13751,8 +13801,8 @@
+ modprobe ath5k debug=0x00000400
+
diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile
---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile.orig 2008-06-25 14:35:03.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile 2008-06-25 14:35:20.000000000 -0400
[...3675 lines suppressed...]
#include <linux/list.h>
#include <linux/types.h>
@@ -125336,8 +125448,8 @@
#endif /* STA_INFO_H */
diff -up linux-2.6.25.noarch/net/mac80211/tkip.c.orig linux-2.6.25.noarch/net/mac80211/tkip.c
---- linux-2.6.25.noarch/net/mac80211/tkip.c.orig 2008-06-25 14:35:04.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/tkip.c 2008-06-25 14:35:21.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/tkip.c.orig 2008-06-27 15:17:13.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/tkip.c 2008-06-27 15:17:28.000000000 -0400
@@ -12,7 +12,7 @@
#include <linux/netdevice.h>
@@ -125435,8 +125547,8 @@
tkip_mixing_phase2(key->u.tkip.p1k_rx[queue],
diff -up linux-2.6.25.noarch/net/mac80211/tkip.h.orig linux-2.6.25.noarch/net/mac80211/tkip.h
---- linux-2.6.25.noarch/net/mac80211/tkip.h.orig 2008-06-25 14:35:04.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/tkip.h 2008-06-25 14:35:21.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/tkip.h.orig 2008-06-27 15:17:13.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/tkip.h 2008-06-27 15:17:28.000000000 -0400
@@ -11,7 +11,7 @@
#include <linux/types.h>
@@ -125456,8 +125568,8 @@
#endif /* TKIP_H */
diff -up linux-2.6.25.noarch/net/mac80211/tx.c.orig linux-2.6.25.noarch/net/mac80211/tx.c
---- linux-2.6.25.noarch/net/mac80211/tx.c.orig 2008-06-25 14:35:04.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/tx.c 2008-06-25 14:35:30.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/tx.c.orig 2008-06-27 15:17:13.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/tx.c 2008-06-27 15:17:28.000000000 -0400
@@ -25,11 +25,12 @@
#include <asm/unaligned.h>
@@ -126912,8 +127024,8 @@
return skb;
}
diff -up linux-2.6.25.noarch/net/mac80211/util.c.orig linux-2.6.25.noarch/net/mac80211/util.c
---- linux-2.6.25.noarch/net/mac80211/util.c.orig 2008-06-25 14:35:04.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/util.c 2008-06-25 14:35:21.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/util.c.orig 2008-06-27 15:17:13.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/util.c 2008-06-27 15:17:28.000000000 -0400
@@ -25,7 +25,8 @@
#include <net/rtnetlink.h>
@@ -127232,8 +127344,8 @@
-EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces);
+EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces_atomic);
diff -up linux-2.6.25.noarch/net/mac80211/wep.c.orig linux-2.6.25.noarch/net/mac80211/wep.c
---- linux-2.6.25.noarch/net/mac80211/wep.c.orig 2008-06-25 14:35:04.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-06-25 14:35:21.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wep.c.orig 2008-06-27 15:17:13.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-06-27 15:17:28.000000000 -0400
@@ -305,39 +305,39 @@ u8 * ieee80211_wep_is_weak_iv(struct sk_
return NULL;
}
@@ -127324,8 +127436,8 @@
+ return TX_CONTINUE;
}
diff -up linux-2.6.25.noarch/net/mac80211/wep.h.orig linux-2.6.25.noarch/net/mac80211/wep.h
---- linux-2.6.25.noarch/net/mac80211/wep.h.orig 2008-06-25 14:35:04.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-06-25 14:35:21.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wep.h.orig 2008-06-27 15:17:13.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-06-27 15:17:28.000000000 -0400
@@ -14,7 +14,7 @@
#include <linux/skbuff.h>
#include <linux/types.h>
@@ -127350,8 +127462,8 @@
#endif /* WEP_H */
diff -up /dev/null linux-2.6.25.noarch/net/mac80211/wext.c
---- /dev/null 2008-06-25 08:17:03.992002591 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-06-25 14:35:21.000000000 -0400
+--- /dev/null 2008-06-26 08:31:46.303004729 -0400
++++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-06-27 15:17:28.000000000 -0400
@@ -0,0 +1,1164 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -128518,8 +128630,8 @@
+ .get_wireless_stats = ieee80211_get_wireless_stats,
+};
diff -up linux-2.6.25.noarch/net/mac80211/wme.c.orig linux-2.6.25.noarch/net/mac80211/wme.c
---- linux-2.6.25.noarch/net/mac80211/wme.c.orig 2008-06-25 14:35:04.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-06-25 14:35:21.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wme.c.orig 2008-06-27 15:17:13.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-06-27 15:17:28.000000000 -0400
@@ -19,10 +19,13 @@
#include "wme.h"
@@ -128729,8 +128841,8 @@
+ }
+}
diff -up linux-2.6.25.noarch/net/mac80211/wme.h.orig linux-2.6.25.noarch/net/mac80211/wme.h
---- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-06-25 14:35:04.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-06-25 14:35:21.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-06-27 15:17:13.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-06-27 15:17:28.000000000 -0400
@@ -24,6 +24,8 @@
#define QOS_CONTROL_TAG1D_MASK 0x07
@@ -128776,8 +128888,8 @@
{
return 0;
diff -up linux-2.6.25.noarch/net/mac80211/wpa.c.orig linux-2.6.25.noarch/net/mac80211/wpa.c
---- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-06-25 14:35:04.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-06-25 14:35:21.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-06-27 15:17:13.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-06-27 15:17:28.000000000 -0400
@@ -70,8 +70,8 @@ static int ieee80211_get_hdr_info(const
}
@@ -129157,8 +129269,8 @@
+ return RX_CONTINUE;
}
diff -up linux-2.6.25.noarch/net/mac80211/wpa.h.orig linux-2.6.25.noarch/net/mac80211/wpa.h
---- linux-2.6.25.noarch/net/mac80211/wpa.h.orig 2008-06-25 14:35:04.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wpa.h 2008-06-25 14:35:21.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wpa.h.orig 2008-06-27 15:17:13.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wpa.h 2008-06-27 15:17:28.000000000 -0400
@@ -13,19 +13,19 @@
#include <linux/types.h>
#include "ieee80211_i.h"
@@ -129192,8 +129304,8 @@
#endif /* WPA_H */
diff -up linux-2.6.25.noarch/net/wireless/core.c.orig linux-2.6.25.noarch/net/wireless/core.c
---- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-06-25 14:35:04.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/core.c 2008-06-25 14:35:21.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-06-27 15:17:13.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/core.c 2008-06-27 15:17:28.000000000 -0400
@@ -232,6 +232,47 @@ int wiphy_register(struct wiphy *wiphy)
{
struct cfg80211_registered_device *drv = wiphy_to_dev(wiphy);
@@ -129243,8 +129355,8 @@
mutex_lock(&cfg80211_drv_mutex);
diff -up linux-2.6.25.noarch/net/wireless/core.h.orig linux-2.6.25.noarch/net/wireless/core.h
---- linux-2.6.25.noarch/net/wireless/core.h.orig 2008-06-25 14:35:04.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/core.h 2008-06-25 14:35:21.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/core.h.orig 2008-06-27 15:17:13.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/core.h 2008-06-27 15:17:28.000000000 -0400
@@ -78,4 +78,7 @@ extern void cfg80211_dev_free(struct cfg
extern int cfg80211_dev_rename(struct cfg80211_registered_device *drv,
char *newname);
@@ -129254,8 +129366,8 @@
+
#endif /* __NET_WIRELESS_CORE_H */
diff -up linux-2.6.25.noarch/net/wireless/Makefile.orig linux-2.6.25.noarch/net/wireless/Makefile
---- linux-2.6.25.noarch/net/wireless/Makefile.orig 2008-06-25 14:35:04.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/Makefile 2008-06-25 14:35:21.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/Makefile.orig 2008-06-27 15:17:13.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/Makefile 2008-06-27 15:17:28.000000000 -0400
@@ -1,5 +1,5 @@
obj-$(CONFIG_WIRELESS_EXT) += wext.o
obj-$(CONFIG_CFG80211) += cfg80211.o
@@ -129264,8 +129376,8 @@
+cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o
cfg80211-$(CONFIG_NL80211) += nl80211.o
diff -up linux-2.6.25.noarch/net/wireless/nl80211.c.orig linux-2.6.25.noarch/net/wireless/nl80211.c
---- linux-2.6.25.noarch/net/wireless/nl80211.c.orig 2008-06-25 14:35:04.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/nl80211.c 2008-06-25 14:35:21.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/nl80211.c.orig 2008-06-27 15:17:13.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/nl80211.c 2008-06-27 15:17:28.000000000 -0400
@@ -81,7 +81,12 @@ static struct nla_policy nl80211_policy[
[NL80211_ATTR_STA_LISTEN_INTERVAL] = { .type = NLA_U16 },
[NL80211_ATTR_STA_SUPPORTED_RATES] = { .type = NLA_BINARY,
@@ -129956,8 +130068,8 @@
/* multicast groups */
diff -up /dev/null linux-2.6.25.noarch/net/wireless/reg.c
---- /dev/null 2008-06-25 08:17:03.992002591 -0400
-+++ linux-2.6.25.noarch/net/wireless/reg.c 2008-06-25 14:35:54.000000000 -0400
+--- /dev/null 2008-06-26 08:31:46.303004729 -0400
++++ linux-2.6.25.noarch/net/wireless/reg.c 2008-06-27 15:17:28.000000000 -0400
@@ -0,0 +1,180 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -130140,8 +130252,8 @@
+ handle_band(wiphy->bands[band], rd);
+}
diff -up /dev/null linux-2.6.25.noarch/net/wireless/util.c
---- /dev/null 2008-06-25 08:17:03.992002591 -0400
-+++ linux-2.6.25.noarch/net/wireless/util.c 2008-06-25 14:35:21.000000000 -0400
+--- /dev/null 2008-06-26 08:31:46.303004729 -0400
++++ linux-2.6.25.noarch/net/wireless/util.c 2008-06-27 15:17:28.000000000 -0400
@@ -0,0 +1,121 @@
+/*
+ * Wireless utility functions
@@ -130265,8 +130377,8 @@
+ set_mandatory_flags_band(wiphy->bands[band], band);
+}
diff -up linux-2.6.25.noarch/net/wireless/wext.c.orig linux-2.6.25.noarch/net/wireless/wext.c
---- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-06-25 14:35:04.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/wext.c 2008-06-25 14:35:21.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-06-27 15:17:13.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/wext.c 2008-06-27 15:17:28.000000000 -0400
@@ -1157,7 +1157,7 @@ static void rtmsg_iwinfo(struct net_devi
struct sk_buff *skb;
int err;
- Previous message: rpms/liferea/devel .cvsignore, 1.72, 1.73 liferea.spec, 1.113, 1.114 sources, 1.73, 1.74
- Next message: rpms/kernel/F-8 kernel.spec, 1.479, 1.480 linux-2.6-wireless.patch, 1.43, 1.44
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list