rpms/kernel/F-7 git-wireless-dev.patch, 1.11, 1.12 kernel-2.6.spec, 1.3231, 1.3232 linux-2.6-wireless.patch, 1.2, 1.3 git-iwlwifi.patch, 1.11, NONE
John W. Linville (linville)
fedora-extras-commits at redhat.com
Thu Jun 14 19:45:08 UTC 2007
Author: linville
Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14065
Modified Files:
git-wireless-dev.patch kernel-2.6.spec
linux-2.6-wireless.patch
Removed Files:
git-iwlwifi.patch
Log Message:
update wireless-dev patch, drop iwlwifi patch (0.0.25 in wireless-dev)
git-wireless-dev.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.11 -r 1.12 git-wireless-dev.patch
Index: git-wireless-dev.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/git-wireless-dev.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- git-wireless-dev.patch 7 Jun 2007 19:07:41 -0000 1.11
+++ git-wireless-dev.patch 14 Jun 2007 19:44:32 -0000 1.12
@@ -1,5 +1,5 @@
---- linux-2.6.21.noarch/CREDITS.orig 2007-06-07 14:04:17.000000000 -0400
-+++ linux-2.6.21.noarch/CREDITS 2007-06-07 14:10:49.000000000 -0400
+--- linux-2.6.21.noarch/CREDITS.orig 2007-06-14 14:07:08.000000000 -0400
++++ linux-2.6.21.noarch/CREDITS 2007-06-14 14:07:58.000000000 -0400
@@ -665,6 +665,11 @@ D: Minor updates to SCSI code for the Co
S: (ask for current address)
S: USA
@@ -66,107 +66,8 @@
N: Lars Wirzenius
E: liw at iki.fi
D: Linux System Administrator's Guide, author, former maintainer
---- linux-2.6.21.noarch/lib/Makefile.orig 2007-06-07 14:24:42.000000000 -0400
-+++ linux-2.6.21.noarch/lib/Makefile 2007-06-07 14:23:36.000000000 -0400
-@@ -40,6 +40,7 @@ endif
- obj-$(CONFIG_BITREVERSE) += bitrev.o
- obj-$(CONFIG_CRC_CCITT) += crc-ccitt.o
- obj-$(CONFIG_CRC16) += crc16.o
-+obj-$(CONFIG_CRC_ITU_T) += crc-itu-t.o
- obj-$(CONFIG_CRC32) += crc32.o
- obj-$(CONFIG_LIBCRC32C) += libcrc32c.o
- obj-$(CONFIG_GENERIC_ALLOCATOR) += genalloc.o
---- linux-2.6.21.noarch/lib/Kconfig.orig 2007-06-07 14:24:42.000000000 -0400
-+++ linux-2.6.21.noarch/lib/Kconfig 2007-06-07 14:23:36.000000000 -0400
-@@ -23,6 +23,14 @@ config CRC16
- the kernel tree does. Such modules that use library CRC16
- functions require M here.
-
-+config CRC_ITU_T
-+ tristate "CRC ITU-T V.41 functions"
-+ help
-+ This option is provided for the case where no in-kernel-tree
-+ modules require CRC ITU-T V.41 functions, but a module built outside
-+ the kernel tree does. Such modules that use library CRC ITU-T V.41
-+ functions require M here.
-+
- config CRC32
- tristate "CRC32 functions"
- default y
---- linux-2.6.21.noarch/lib/crc-itu-t.c.orig 2007-06-07 14:25:20.000000000 -0400
-+++ linux-2.6.21.noarch/lib/crc-itu-t.c 2007-06-07 14:23:36.000000000 -0400
-@@ -0,0 +1,69 @@
-+/*
-+ * crc-itu-t.c
-+ *
-+ * This source code is licensed under the GNU General Public License,
-+ * Version 2. See the file COPYING for more details.
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/module.h>
-+#include <linux/crc-itu-t.h>
-+
-+/** CRC table for the CRC ITU-T V.41 0x0x1021 (x^16 + x^12 + x^15 + 1) */
-+const u16 crc_itu_t_table[256] = {
-+ 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7,
-+ 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef,
-+ 0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6,
-+ 0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de,
-+ 0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485,
-+ 0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d,
-+ 0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4,
-+ 0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc,
-+ 0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823,
-+ 0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b,
-+ 0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12,
-+ 0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a,
-+ 0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41,
-+ 0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49,
-+ 0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70,
-+ 0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78,
-+ 0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f,
-+ 0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067,
-+ 0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e,
-+ 0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256,
-+ 0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d,
-+ 0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405,
-+ 0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c,
-+ 0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634,
-+ 0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab,
-+ 0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3,
-+ 0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a,
-+ 0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92,
-+ 0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9,
-+ 0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1,
-+ 0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8,
-+ 0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0
-+};
-+
-+EXPORT_SYMBOL(crc_itu_t_table);
-+
-+/**
-+ * crc_itu_t - Compute the CRC-ITU-T for the data buffer
-+ *
-+ * @crc: previous CRC value
-+ * @buffer: data pointer
-+ * @len: number of bytes in the buffer
-+ *
-+ * Returns the updated CRC value
-+ */
-+u16 crc_itu_t(u16 crc, const u8 *buffer, size_t len)
-+{
-+ while (len--)
-+ crc = crc_itu_t_byte(crc, *buffer++);
-+ return crc;
-+}
-+EXPORT_SYMBOL(crc_itu_t);
-+
-+MODULE_DESCRIPTION("CRC ITU-T V.41 calculations");
-+MODULE_LICENSE("GPL");
-+
---- linux-2.6.21.noarch/include/linux/nl80211.h.orig 2007-06-07 14:04:17.000000000 -0400
-+++ linux-2.6.21.noarch/include/linux/nl80211.h 2007-06-07 14:20:34.000000000 -0400
+--- linux-2.6.21.noarch/include/linux/nl80211.h.orig 2007-06-14 14:07:08.000000000 -0400
++++ linux-2.6.21.noarch/include/linux/nl80211.h 2007-06-14 14:07:58.000000000 -0400
@@ -7,6 +7,217 @@
*/
@@ -442,9 +343,9 @@
+#define NL80211_KEYTYPE_MAX (__NL80211_KEYTYPE_AFTER_LAST - 1)
+
#endif /* __LINUX_NL80211_H */
---- linux-2.6.21.noarch/include/linux/ieee80211.h.orig 2007-06-07 14:04:17.000000000 -0400
-+++ linux-2.6.21.noarch/include/linux/ieee80211.h 2007-06-07 14:10:50.000000000 -0400
-@@ -106,6 +106,69 @@ struct ieee80211_hdr {
+--- linux-2.6.21.noarch/include/linux/ieee80211.h.orig 2007-06-14 14:07:08.000000000 -0400
++++ linux-2.6.21.noarch/include/linux/ieee80211.h 2007-06-14 14:07:58.000000000 -0400
+@@ -106,6 +106,75 @@ struct ieee80211_hdr {
} __attribute__ ((packed));
@@ -466,28 +367,34 @@
+}__attribute__ ((packed));
+
+
-+#define IEEE80211_TSINFO_TYPE(a) ((a.short1 & 0x0001) >> 0)
-+#define IEEE80211_TSINFO_TSID(a) ((a.short1 & 0x001E) >> 1)
-+#define IEEE80211_TSINFO_DIR(a) ((a.short1 & 0x0060) >> 5)
-+#define IEEE80211_TSINFO_POLICY(a) ((a.short1 & 0x0180) >> 7)
-+#define IEEE80211_TSINFO_AGG(a) ((a.short1 & 0x0200) >> 9)
-+#define IEEE80211_TSINFO_APSD(a) ((a.short1 & 0x0400) >> 10)
-+#define IEEE80211_TSINFO_UP(a) ((a.short1 & 0x3800) >> 11)
-+#define IEEE80211_TSINFO_ACK(a) ((a.short1 & 0xC000) >> 14)
++#define IEEE80211_TSINFO_TYPE(a) ((a.byte1 & 0x01) >> 0)
++#define IEEE80211_TSINFO_TSID(a) ((a.byte1 & 0x1E) >> 1)
++#define IEEE80211_TSINFO_DIR(a) ((a.byte1 & 0x60) >> 5)
++#define IEEE80211_TSINFO_POLICY(a) ((a.byte1 & 0x80) >> 7 + \
++ (a.byte2 & 0x01) << 1)
++#define IEEE80211_TSINFO_AGG(a) ((a.byte2 & 0x02) >> 1)
++#define IEEE80211_TSINFO_APSD(a) ((a.byte2 & 0x04) >> 2)
++#define IEEE80211_TSINFO_UP(a) ((a.byte2 & 0x38) >> 3)
++#define IEEE80211_TSINFO_ACK(a) ((a.byte2 & 0xC0) >> 6)
+#define IEEE80211_TSINFO_SCHEDULE(a) ((a.byte3 & 0x01) >> 0)
+
-+#define SET_TSINFO_TYPE(i, d) (i.short1 |= (d << 0) & 0x0001)
-+#define SET_TSINFO_TSID(i, d) (i.short1 |= (d << 1) & 0x001E)
-+#define SET_TSINFO_DIR(i, d) (i.short1 |= (d << 5) & 0x0060)
-+#define SET_TSINFO_POLICY(i, d) (i.short1 |= (d << 7) & 0x0180)
-+#define SET_TSINFO_AGG(i, d) (i.short1 |= (d << 9) & 0x0200)
-+#define SET_TSINFO_APSD(i, d) (i.short1 |= (d << 10) & 0x0400)
-+#define SET_TSINFO_UP(i, d) (i.short1 |= (d << 11) & 0x3800)
-+#define SET_TSINFO_ACK(i, d) (i.short1 |= (d << 14) & 0xC000)
-+#define SET_TSINFO_SCHEDULE(i, d) (i.byte3 |= (d << 0) & 0x01)
++#define IEEE80211_SET_TSINFO_TYPE(i, d) (i.byte1 |= (d << 0) & 0x01)
++#define IEEE80211_SET_TSINFO_TSID(i, d) (i.byte1 |= (d << 1) & 0x1E)
++#define IEEE80211_SET_TSINFO_DIR(i, d) (i.byte1 |= (d << 5) & 0x60)
++#define IEEE80211_SET_TSINFO_POLICY(i, d) \
++do { \
++ i.byte1 |= (d & 0x01) << 7; \
++ i.byte2 |= (d & 0x02) >> 1; \
++} while(0)
++#define IEEE80211_SET_TSINFO_AGG(i, d) (i.byte2 |= (d << 1) & 0x02)
++#define IEEE80211_SET_TSINFO_APSD(i, d) (i.byte2 |= (d << 2) & 0x04)
++#define IEEE80211_SET_TSINFO_UP(i, d) (i.byte2 |= (d << 3) & 0x38)
++#define IEEE80211_SET_TSINFO_ACK(i, d) (i.byte2 |= (d << 6) & 0xC0)
++#define IEEE80211_SET_TSINFO_SCHEDULE(i, d) (i.byte3 |= (d << 0) & 0x01)
+
+struct ieee80211_ts_info {
-+ __le16 short1;
++ u8 byte1;
++ u8 byte2;
+ u8 byte3;
+} __attribute__ ((packed));
+
@@ -514,7 +421,7 @@
struct ieee80211_mgmt {
__le16 frame_control;
__le16 duration;
-@@ -173,9 +236,51 @@ struct ieee80211_mgmt {
+@@ -173,9 +242,51 @@ struct ieee80211_mgmt {
struct {
u8 action_code;
[...21987 lines suppressed...]
+ .load_firmware = rt73usb_load_firmware,
+ .initialize = rt2x00usb_initialize,
+ .uninitialize = rt2x00usb_uninitialize,
-+ .enable_radio = rt73usb_enable_radio,
-+ .disable_radio = rt73usb_disable_radio,
-+ .set_state = rt73usb_set_state,
-+ .toggle_rx = rt73usb_toggle_rx,
++ .set_device_state = rt73usb_set_device_state,
++ .link_tuner = rt73usb_link_tuner,
+ .write_tx_desc = rt73usb_write_tx_desc,
+ .write_tx_data = rt2x00usb_write_tx_data,
-+ .kick_beacon_gen = rt73usb_kick_beacon_gen,
++ .kick_tx_queue = rt73usb_kick_tx_queue,
+ .config_type = rt73usb_config_type,
+ .config_phymode = rt73usb_config_phymode,
+ .config_channel = rt73usb_config_channel,
+ .config_mac_addr = rt73usb_config_mac_addr,
+ .config_bssid = rt73usb_config_bssid,
++ .config_promisc = rt73usb_config_promisc,
+ .config_txpower = rt73usb_config_txpower,
+ .config_antenna = rt73usb_config_antenna,
+ .config_duration = rt73usb_config_duration,
+};
+
+static const struct rt2x00_ops rt73usb_ops = {
++ .name = DRV_NAME,
++ .rxd_size = RXD_DESC_SIZE,
++ .txd_size = TXD_DESC_SIZE,
+ .lib = &rt73usb_rt2x00_ops,
+ .hw = &rt73usb_mac80211_ops,
-+#ifdef CONFIG_RT2X00_DEBUGFS
++#ifdef CONFIG_RT2X00_LIB_DEBUGFS
+ .debugfs = &rt73usb_rt2x00debug,
-+#endif /* CONFIG_RT2X00_DEBUGFS */
++#endif /* CONFIG_RT2X00_LIB_DEBUGFS */
+};
+
+/*
@@ -81377,9 +87350,11 @@
+MODULE_DESCRIPTION("Ralink RT73 USB Wireless LAN driver.");
+MODULE_SUPPORTED_DEVICE("Ralink RT2571W & RT2671 USB chipset based cards");
+MODULE_DEVICE_TABLE(usb, rt73usb_device_table);
++MODULE_FIRMWARE(FIRMWARE_RT2571);
+MODULE_LICENSE("GPL");
+
+#ifdef CONFIG_RT2X00_DEBUG
++int rt2x00_debug_level = 0;
+module_param_named(debug, rt2x00_debug_level, bool, S_IWUSR | S_IRUGO);
+MODULE_PARM_DESC(debug, "Set this parameter to 1 to enable debug output.");
+#endif /* CONFIG_RT2X00_DEBUG */
@@ -81410,13 +87385,13 @@
+
+module_init(rt73usb_init);
+module_exit(rt73usb_exit);
---- /dev/null 2007-06-07 08:23:25.439306270 -0400
-+++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/README 2007-06-07 14:10:50.000000000 -0400
+--- /dev/null 2007-06-13 08:37:39.438809838 -0400
++++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/README 2007-06-14 14:07:59.000000000 -0400
@@ -0,0 +1,2 @@
+This directory contains IEEE 802.11 wireless LAN drivers that are using
+Devicescape IEEE 802.11 stack (net/mac80211).
---- linux-2.6.21.noarch/drivers/net/wireless/Kconfig.orig 2007-06-07 14:04:17.000000000 -0400
-+++ linux-2.6.21.noarch/drivers/net/wireless/Kconfig 2007-06-07 14:10:50.000000000 -0400
+--- linux-2.6.21.noarch/drivers/net/wireless/Kconfig.orig 2007-06-14 14:07:08.000000000 -0400
++++ linux-2.6.21.noarch/drivers/net/wireless/Kconfig 2007-06-14 14:07:59.000000000 -0400
@@ -529,4 +529,6 @@ source "drivers/net/wireless/hostap/Kcon
source "drivers/net/wireless/bcm43xx/Kconfig"
source "drivers/net/wireless/zd1211rw/Kconfig"
@@ -81424,8 +87399,8 @@
+source "drivers/net/wireless/mac80211/Kconfig"
+
endmenu
---- linux-2.6.21.noarch/drivers/net/wireless/bcm43xx/Kconfig.orig 2007-06-07 14:04:17.000000000 -0400
-+++ linux-2.6.21.noarch/drivers/net/wireless/bcm43xx/Kconfig 2007-06-07 14:10:50.000000000 -0400
+--- linux-2.6.21.noarch/drivers/net/wireless/bcm43xx/Kconfig.orig 2007-06-14 14:07:08.000000000 -0400
++++ linux-2.6.21.noarch/drivers/net/wireless/bcm43xx/Kconfig 2007-06-14 14:07:59.000000000 -0400
@@ -1,6 +1,7 @@
config BCM43XX
tristate "Broadcom BCM43xx wireless support"
@@ -81434,8 +87409,8 @@
select WIRELESS_EXT
select FW_LOADER
select HW_RANDOM
---- /dev/null 2007-06-07 08:23:25.439306270 -0400
-+++ linux-2.6.21.noarch/drivers/ssb/Makefile 2007-06-07 14:10:50.000000000 -0400
+--- /dev/null 2007-06-13 08:37:39.438809838 -0400
++++ linux-2.6.21.noarch/drivers/ssb/Makefile 2007-06-14 14:07:59.000000000 -0400
@@ -0,0 +1,11 @@
+ssb-builtin-drivers-y += driver_chipcommon.o
+ssb-builtin-drivers-$(CONFIG_SSB_DRIVER_MIPS) += driver_mipscore.o
@@ -81448,8 +87423,8 @@
+
+ssb-objs := main.o scan.o \
+ $(ssb-hostsupport-y) $(ssb-builtin-drivers-y)
---- /dev/null 2007-06-07 08:23:25.439306270 -0400
-+++ linux-2.6.21.noarch/drivers/ssb/pcmcia.c 2007-06-07 14:10:50.000000000 -0400
+--- /dev/null 2007-06-13 08:37:39.438809838 -0400
++++ linux-2.6.21.noarch/drivers/ssb/pcmcia.c 2007-06-14 14:07:59.000000000 -0400
@@ -0,0 +1,256 @@
+/*
+ * Sonics Silicon Backplane
@@ -81707,8 +87682,8 @@
+error:
+ return -ENODEV;
+}
---- /dev/null 2007-06-07 08:23:25.439306270 -0400
-+++ linux-2.6.21.noarch/drivers/ssb/main.c 2007-06-07 14:10:50.000000000 -0400
+--- /dev/null 2007-06-13 08:37:39.438809838 -0400
++++ linux-2.6.21.noarch/drivers/ssb/main.c 2007-06-14 14:07:59.000000000 -0400
@@ -0,0 +1,1054 @@
+/*
+ * Sonics Silicon Backplane
@@ -82764,8 +88739,8 @@
+ bus_unregister(&ssb_bustype);
+}
+module_exit(ssb_modexit)
---- /dev/null 2007-06-07 08:23:25.439306270 -0400
-+++ linux-2.6.21.noarch/drivers/ssb/pcihost_wrapper.c 2007-06-07 14:10:50.000000000 -0400
+--- /dev/null 2007-06-13 08:37:39.438809838 -0400
++++ linux-2.6.21.noarch/drivers/ssb/pcihost_wrapper.c 2007-06-14 14:07:59.000000000 -0400
@@ -0,0 +1,104 @@
+/*
+ * Sonics Silicon Backplane
@@ -82871,8 +88846,8 @@
+ return pci_register_driver(driver);
+}
+EXPORT_SYMBOL(ssb_pcihost_register);
---- /dev/null 2007-06-07 08:23:25.439306270 -0400
-+++ linux-2.6.21.noarch/drivers/ssb/driver_mipscore.c 2007-06-07 14:10:50.000000000 -0400
+--- /dev/null 2007-06-13 08:37:39.438809838 -0400
++++ linux-2.6.21.noarch/drivers/ssb/driver_mipscore.c 2007-06-14 14:07:59.000000000 -0400
@@ -0,0 +1,258 @@
+/*
+ * Sonics Silicon Backplane
@@ -83132,8 +89107,8 @@
+ ssb_mips_serial_init(mcore);
+ ssb_mips_flash_detect(mcore);
+}
---- /dev/null 2007-06-07 08:23:25.439306270 -0400
-+++ linux-2.6.21.noarch/drivers/ssb/ssb_private.h 2007-06-07 14:10:50.000000000 -0400
+--- /dev/null 2007-06-13 08:37:39.438809838 -0400
++++ linux-2.6.21.noarch/drivers/ssb/ssb_private.h 2007-06-14 14:07:59.000000000 -0400
@@ -0,0 +1,151 @@
+#ifndef LINUX_SSB_PRIVATE_H_
+#define LINUX_SSB_PRIVATE_H_
@@ -83286,8 +89261,8 @@
+
+
+#endif /* LINUX_SSB_PRIVATE_H_ */
---- /dev/null 2007-06-07 08:23:25.439306270 -0400
-+++ linux-2.6.21.noarch/drivers/ssb/pci.c 2007-06-07 14:10:50.000000000 -0400
+--- /dev/null 2007-06-13 08:37:39.438809838 -0400
++++ linux-2.6.21.noarch/drivers/ssb/pci.c 2007-06-14 14:07:59.000000000 -0400
@@ -0,0 +1,672 @@
+/*
+ * Sonics Silicon Backplane PCI-Hostbus related functions.
@@ -83961,8 +89936,8 @@
+ device_remove_file(&pdev->dev, &dev_attr_ssb_sprom);
+ return err;
+}
---- /dev/null 2007-06-07 08:23:25.439306270 -0400
-+++ linux-2.6.21.noarch/drivers/ssb/driver_chipcommon.c 2007-06-07 14:10:50.000000000 -0400
+--- /dev/null 2007-06-13 08:37:39.438809838 -0400
++++ linux-2.6.21.noarch/drivers/ssb/driver_chipcommon.c 2007-06-14 14:07:59.000000000 -0400
@@ -0,0 +1,402 @@
+/*
+ * Sonics Silicon Backplane
@@ -84366,8 +90341,8 @@
+ return nr_ports;
+}
+#endif /* CONFIG_SSB_SERIAL */
---- /dev/null 2007-06-07 08:23:25.439306270 -0400
-+++ linux-2.6.21.noarch/drivers/ssb/Kconfig 2007-06-07 14:10:50.000000000 -0400
+--- /dev/null 2007-06-13 08:37:39.438809838 -0400
++++ linux-2.6.21.noarch/drivers/ssb/Kconfig 2007-06-14 14:07:59.000000000 -0400
@@ -0,0 +1,93 @@
+menu "Sonics Silicon Backplane"
+
@@ -84462,8 +90437,8 @@
+ If unsure, say N
+
+endmenu
---- /dev/null 2007-06-07 08:23:25.439306270 -0400
-+++ linux-2.6.21.noarch/drivers/ssb/scan.c 2007-06-07 14:10:50.000000000 -0400
+--- /dev/null 2007-06-13 08:37:39.438809838 -0400
++++ linux-2.6.21.noarch/drivers/ssb/scan.c 2007-06-14 14:07:59.000000000 -0400
@@ -0,0 +1,407 @@
+/*
+ * Sonics Silicon Backplane
@@ -84872,8 +90847,8 @@
+ ssb_iounmap(bus);
+ goto out;
+}
---- /dev/null 2007-06-07 08:23:25.439306270 -0400
-+++ linux-2.6.21.noarch/drivers/ssb/driver_pcicore.c 2007-06-07 14:10:50.000000000 -0400
+--- /dev/null 2007-06-13 08:37:39.438809838 -0400
++++ linux-2.6.21.noarch/drivers/ssb/driver_pcicore.c 2007-06-14 14:07:59.000000000 -0400
@@ -0,0 +1,556 @@
+/*
+ * Sonics Silicon Backplane
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3231
retrieving revision 1.3232
diff -u -r1.3231 -r1.3232
--- kernel-2.6.spec 14 Jun 2007 18:04:58 -0000 1.3231
+++ kernel-2.6.spec 14 Jun 2007 19:44:33 -0000 1.3232
@@ -627,8 +627,7 @@
# Wireless bits
Patch2300: linux-2.6-wireless.patch
Patch2301: git-wireless-dev.patch
-Patch2302: git-iwlwifi.patch
-Patch2303: linux-2.6-bcm43xx-pci-neuter.patch
+Patch2302: linux-2.6-bcm43xx-pci-neuter.patch
# Assorted dyntick/clock/timer fixes.
Patch2402: linux-2.6-acpi-keep-tsc-stable-when-lapic-timer-c2-ok-is-set.patch
@@ -1411,10 +1410,8 @@
%patch2300 -p1
# Add the new wireless stack and drivers from wireless-dev
%patch2301 -p1
-# Update iwlwifi driver from www.intellinuxwireless.org git tree
-%patch2302 -p1
# avoid bcm43xx vs bcm43xx-mac80211 PCI ID conflicts
-%patch2303 -p1
+%patch2302 -p1
# Assorted dyntick/clock/timer fixes.
%patch2402 -p1
@@ -2399,6 +2396,10 @@
%endif
%changelog
+* Thu Jun 14 2007 John W. Linville <linville at redhat.com>
+- Refresh wireless-dev patch
+- Drop iwlwifi patch (0.0.25 now in wireless-dev!)
+
* Thu Jun 14 2007 Dave Jones <davej at redhat.com>
- Remove the warning cleanups.
linux-2.6-wireless.patch:
Index: linux-2.6-wireless.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-wireless.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-wireless.patch 7 Jun 2007 19:07:43 -0000 1.2
+++ linux-2.6-wireless.patch 14 Jun 2007 19:44:33 -0000 1.3
@@ -1,5 +1,5 @@
---- linux-2.6.21.noarch/CREDITS.orig 2007-06-07 13:55:49.000000000 -0400
-+++ linux-2.6.21.noarch/CREDITS 2007-06-07 13:55:56.000000000 -0400
+--- linux-2.6.21.noarch/CREDITS.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/CREDITS 2007-06-14 13:40:56.000000000 -0400
@@ -317,6 +317,12 @@ S: 2322 37th Ave SW
S: Seattle, Washington 98126-2010
S: USA
@@ -13,8 +13,107 @@
N: Stephen R. van den Berg (AKA BuGless)
E: berg at pool.informatik.rwth-aachen.de
D: General kernel, gcc, and libc hacker
---- linux-2.6.21.noarch/include/linux/nl80211.h.orig 2007-06-07 13:55:56.000000000 -0400
-+++ linux-2.6.21.noarch/include/linux/nl80211.h 2007-06-07 13:55:56.000000000 -0400
+--- linux-2.6.21.noarch/lib/Makefile.orig 2007-06-14 13:54:21.000000000 -0400
++++ linux-2.6.21.noarch/lib/Makefile 2007-06-14 13:41:27.000000000 -0400
+@@ -40,6 +40,7 @@ endif
+ obj-$(CONFIG_BITREVERSE) += bitrev.o
+ obj-$(CONFIG_CRC_CCITT) += crc-ccitt.o
+ obj-$(CONFIG_CRC16) += crc16.o
++obj-$(CONFIG_CRC_ITU_T) += crc-itu-t.o
+ obj-$(CONFIG_CRC32) += crc32.o
+ obj-$(CONFIG_LIBCRC32C) += libcrc32c.o
+ obj-$(CONFIG_GENERIC_ALLOCATOR) += genalloc.o
+--- linux-2.6.21.noarch/lib/Kconfig.orig 2007-06-14 13:54:21.000000000 -0400
++++ linux-2.6.21.noarch/lib/Kconfig 2007-06-14 13:41:27.000000000 -0400
+@@ -23,6 +23,14 @@ config CRC16
+ the kernel tree does. Such modules that use library CRC16
+ functions require M here.
+
++config CRC_ITU_T
++ tristate "CRC ITU-T V.41 functions"
++ help
++ This option is provided for the case where no in-kernel-tree
++ modules require CRC ITU-T V.41 functions, but a module built outside
++ the kernel tree does. Such modules that use library CRC ITU-T V.41
++ functions require M here.
++
+ config CRC32
+ tristate "CRC32 functions"
+ default y
+--- linux-2.6.21.noarch/lib/crc-itu-t.c.orig 2007-06-14 13:54:39.000000000 -0400
++++ linux-2.6.21.noarch/lib/crc-itu-t.c 2007-06-14 13:41:27.000000000 -0400
+@@ -0,0 +1,69 @@
++/*
++ * crc-itu-t.c
++ *
++ * This source code is licensed under the GNU General Public License,
++ * Version 2. See the file COPYING for more details.
++ */
++
++#include <linux/types.h>
++#include <linux/module.h>
++#include <linux/crc-itu-t.h>
++
++/** CRC table for the CRC ITU-T V.41 0x0x1021 (x^16 + x^12 + x^15 + 1) */
++const u16 crc_itu_t_table[256] = {
++ 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7,
++ 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef,
++ 0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6,
++ 0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de,
++ 0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485,
++ 0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d,
++ 0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4,
++ 0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc,
++ 0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823,
++ 0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b,
++ 0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12,
++ 0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a,
++ 0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41,
++ 0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49,
++ 0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70,
++ 0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78,
++ 0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f,
++ 0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067,
++ 0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e,
++ 0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256,
++ 0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d,
++ 0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405,
++ 0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c,
++ 0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634,
++ 0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab,
++ 0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3,
++ 0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a,
++ 0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92,
++ 0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9,
++ 0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1,
++ 0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8,
++ 0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0
++};
++
++EXPORT_SYMBOL(crc_itu_t_table);
++
++/**
++ * crc_itu_t - Compute the CRC-ITU-T for the data buffer
++ *
++ * @crc: previous CRC value
++ * @buffer: data pointer
++ * @len: number of bytes in the buffer
++ *
++ * Returns the updated CRC value
++ */
++u16 crc_itu_t(u16 crc, const u8 *buffer, size_t len)
++{
++ while (len--)
++ crc = crc_itu_t_byte(crc, *buffer++);
++ return crc;
++}
++EXPORT_SYMBOL(crc_itu_t);
++
++MODULE_DESCRIPTION("CRC ITU-T V.41 calculations");
++MODULE_LICENSE("GPL");
++
+--- linux-2.6.21.noarch/include/linux/nl80211.h.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/include/linux/nl80211.h 2007-06-14 13:40:56.000000000 -0400
@@ -0,0 +1,38 @@
+#ifndef __LINUX_NL80211_H
+#define __LINUX_NL80211_H
@@ -54,8 +153,8 @@
+#define NL80211_IFTYPE_MAX (__NL80211_IFTYPE_AFTER_LAST - 1)
+
+#endif /* __LINUX_NL80211_H */
---- linux-2.6.21.noarch/include/linux/ieee80211.h.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/include/linux/ieee80211.h 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/include/linux/ieee80211.h.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/include/linux/ieee80211.h 2007-06-14 13:40:56.000000000 -0400
@@ -0,0 +1,342 @@
+/*
+ * IEEE 802.11 defines
@@ -399,8 +498,8 @@
+#define WLAN_MAX_KEY_LEN 32
+
+#endif /* IEEE80211_H */
---- linux-2.6.21.noarch/include/linux/Kbuild.orig 2007-06-07 13:55:49.000000000 -0400
-+++ linux-2.6.21.noarch/include/linux/Kbuild 2007-06-07 13:55:56.000000000 -0400
+--- linux-2.6.21.noarch/include/linux/Kbuild.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/include/linux/Kbuild 2007-06-14 13:40:56.000000000 -0400
@@ -116,6 +116,7 @@ header-y += netrom.h
header-y += nfs2.h
header-y += nfs4_mount.h
@@ -409,8 +508,8 @@
header-y += oom.h
header-y += param.h
header-y += pci_regs.h
---- linux-2.6.21.noarch/include/linux/netdevice.h.orig 2007-06-07 13:55:49.000000000 -0400
-+++ linux-2.6.21.noarch/include/linux/netdevice.h 2007-06-07 13:55:56.000000000 -0400
+--- linux-2.6.21.noarch/include/linux/netdevice.h.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/include/linux/netdevice.h 2007-06-14 13:40:57.000000000 -0400
@@ -42,6 +42,8 @@
struct vlan_group;
struct ethtool_ops;
@@ -429,8 +528,39 @@
/*
* Cache line mostly used on receive path (including eth_type_trans())
---- linux-2.6.21.noarch/include/net/wext.h.orig 2007-06-07 13:55:56.000000000 -0400
-+++ linux-2.6.21.noarch/include/net/wext.h 2007-06-07 13:55:56.000000000 -0400
+--- linux-2.6.21.noarch/include/linux/crc-itu-t.h.orig 2007-06-14 13:54:39.000000000 -0400
++++ linux-2.6.21.noarch/include/linux/crc-itu-t.h 2007-06-14 13:41:27.000000000 -0400
+@@ -0,0 +1,28 @@
++/*
++ * crc-itu-t.h - CRC ITU-T V.41 routine
++ *
++ * Implements the standard CRC ITU-T V.41:
++ * Width 16
++ * Poly 0x0x1021 (x^16 + x^12 + x^15 + 1)
++ * Init 0
++ *
++ * This source code is licensed under the GNU General Public License,
++ * Version 2. See the file COPYING for more details.
++ */
++
++#ifndef CRC_ITU_T_H
++#define CRC_ITU_T_H
++
++#include <linux/types.h>
++
++extern u16 const crc_itu_t_table[256];
++
++extern u16 crc_itu_t(u16 crc, const u8 *buffer, size_t len);
++
++static inline u16 crc_itu_t_byte(u16 crc, const u8 data)
++{
++ return (crc << 8) ^ crc_itu_t_table[((crc >> 8) ^ data) & 0xff];
++}
++
++#endif /* CRC_ITU_T_H */
++
+--- linux-2.6.21.noarch/include/net/wext.h.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/include/net/wext.h 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,24 @@
+#ifndef __NET_WEXT_H
+#define __NET_WEXT_H
@@ -456,8 +586,8 @@
+#endif
+
+#endif /* __NET_WEXT_H */
---- linux-2.6.21.noarch/include/net/wireless.h.orig 2007-06-07 13:55:56.000000000 -0400
-+++ linux-2.6.21.noarch/include/net/wireless.h 2007-06-07 13:55:56.000000000 -0400
+--- linux-2.6.21.noarch/include/net/wireless.h.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/include/net/wireless.h 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,139 @@
+#ifndef __NET_WIRELESS_H
+#define __NET_WIRELESS_H
@@ -598,8 +728,8 @@
+extern void wiphy_free(struct wiphy *wiphy);
+
+#endif /* __NET_WIRELESS_H */
---- linux-2.6.21.noarch/include/net/cfg80211.h.orig 2007-06-07 13:55:56.000000000 -0400
-+++ linux-2.6.21.noarch/include/net/cfg80211.h 2007-06-07 13:55:56.000000000 -0400
+--- linux-2.6.21.noarch/include/net/cfg80211.h.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/include/net/cfg80211.h 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,40 @@
+#ifndef __NET_CFG80211_H
+#define __NET_CFG80211_H
@@ -641,8 +771,8 @@
+};
+
+#endif /* __NET_CFG80211_H */
---- linux-2.6.21.noarch/include/net/mac80211.h.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/include/net/mac80211.h 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/include/net/mac80211.h.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/include/net/mac80211.h 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,1045 @@
+/*
+ * Low-level hardware driver -- IEEE 802.11 driver (80211.o) interface
@@ -1689,8 +1819,8 @@
+ ((u8*)(x))[3], ((u8*)(x))[4], ((u8*)(x))[5]
+
+#endif /* MAC80211_H */
---- linux-2.6.21.noarch/include/net/iw_handler.h.orig 2007-06-07 13:55:49.000000000 -0400
-+++ linux-2.6.21.noarch/include/net/iw_handler.h 2007-06-07 13:55:56.000000000 -0400
+--- linux-2.6.21.noarch/include/net/iw_handler.h.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/include/net/iw_handler.h 2007-06-14 13:40:57.000000000 -0400
@@ -431,26 +431,7 @@ struct iw_public_data {
* Those may be called only within the kernel.
*/
@@ -1719,8 +1849,8 @@
/* Send a single event to user space */
extern void wireless_send_event(struct net_device * dev,
---- linux-2.6.21.noarch/MAINTAINERS.orig 2007-06-07 13:55:49.000000000 -0400
-+++ linux-2.6.21.noarch/MAINTAINERS 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/MAINTAINERS.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/MAINTAINERS 2007-06-14 13:40:57.000000000 -0400
@@ -656,6 +656,7 @@ S: Supported
ATMEL WIRELESS DRIVER
P: Simon Kelley
@@ -1850,8 +1980,8 @@
L: zd1211-devs at lists.sourceforge.net (subscribers-only)
S: Maintained
---- linux-2.6.21.noarch/net/Makefile.orig 2007-06-07 13:55:49.000000000 -0400
-+++ linux-2.6.21.noarch/net/Makefile 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/Makefile.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/Makefile 2007-06-14 13:40:57.000000000 -0400
@@ -44,6 +44,8 @@ obj-$(CONFIG_ECONET) += econet/
obj-$(CONFIG_VLAN_8021Q) += 8021q/
obj-$(CONFIG_IP_DCCP) += dccp/
@@ -1861,8 +1991,8 @@
obj-$(CONFIG_IEEE80211) += ieee80211/
obj-$(CONFIG_TIPC) += tipc/
obj-$(CONFIG_NETLABEL) += netlabel/
---- linux-2.6.21.noarch/net/ieee80211/Kconfig.orig 2007-06-07 13:55:49.000000000 -0400
-+++ linux-2.6.21.noarch/net/ieee80211/Kconfig 2007-06-07 13:55:56.000000000 -0400
+--- linux-2.6.21.noarch/net/ieee80211/Kconfig.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/ieee80211/Kconfig 2007-06-14 13:40:57.000000000 -0400
@@ -56,7 +56,8 @@ config IEEE80211_CRYPT_CCMP
config IEEE80211_CRYPT_TKIP
@@ -1873,8 +2003,8 @@
select CRYPTO
select CRYPTO_MICHAEL_MIC
select CRYPTO_ECB
---- linux-2.6.21.noarch/net/core/Makefile.orig 2007-06-07 13:55:49.000000000 -0400
-+++ linux-2.6.21.noarch/net/core/Makefile 2007-06-07 13:55:56.000000000 -0400
+--- linux-2.6.21.noarch/net/core/Makefile.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/core/Makefile 2007-06-14 13:40:57.000000000 -0400
@@ -13,7 +13,6 @@ obj-y += dev.o ethtool.o dev_mcast
obj-$(CONFIG_XFRM) += flow.o
obj-$(CONFIG_SYSFS) += net-sysfs.o
@@ -1883,8 +2013,8 @@
obj-$(CONFIG_NETPOLL) += netpoll.o
obj-$(CONFIG_NET_DMA) += user_dma.o
obj-$(CONFIG_FIB_RULES) += fib_rules.o
---- linux-2.6.21.noarch/net/core/wireless.c.orig 2007-06-07 13:55:49.000000000 -0400
-+++ linux-2.6.21.noarch/net/core/wireless.c 2007-06-07 13:55:56.000000000 -0400
+--- linux-2.6.21.noarch/net/core/wireless.c.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/core/wireless.c 2007-06-14 13:40:57.000000000 -0400
@@ -1,2371 +0,0 @@
-/*
- * This file implement the Wireless Extensions APIs.
@@ -4257,8 +4387,8 @@
-EXPORT_SYMBOL(iw_handler_set_thrspy);
-EXPORT_SYMBOL(wireless_send_event);
-EXPORT_SYMBOL(wireless_spy_update);
---- linux-2.6.21.noarch/net/core/dev.c.orig 2007-06-07 13:55:49.000000000 -0400
-+++ linux-2.6.21.noarch/net/core/dev.c 2007-06-07 13:55:56.000000000 -0400
+--- linux-2.6.21.noarch/net/core/dev.c.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/core/dev.c 2007-06-14 13:40:57.000000000 -0400
@@ -109,7 +109,7 @@
#include <linux/netpoll.h>
#include <linux/rcupdate.h>
@@ -4322,8 +4452,8 @@
return -EINVAL;
}
}
---- linux-2.6.21.noarch/net/core/rtnetlink.c.orig 2007-06-07 13:55:49.000000000 -0400
-+++ linux-2.6.21.noarch/net/core/rtnetlink.c 2007-06-07 13:55:56.000000000 -0400
+--- linux-2.6.21.noarch/net/core/rtnetlink.c.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/core/rtnetlink.c 2007-06-14 13:40:57.000000000 -0400
@@ -51,10 +51,6 @@
#include <net/pkt_sched.h>
#include <net/fib_rules.h>
@@ -4376,8 +4506,8 @@
nskb = nlmsg_new(if_nlmsg_size(iw_buf_len), GFP_KERNEL);
if (nskb == NULL) {
err = -ENOBUFS;
---- linux-2.6.21.noarch/net/mac80211/wme.h.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/wme.h 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/wme.h.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/wme.h 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,57 @@
+/*
+ * IEEE 802.11 driver (80211.o) - QoS datatypes
@@ -4436,8 +4566,8 @@
+#endif /* CONFIG_NET_SCHED */
+
+#endif /* _WME_H */
---- linux-2.6.21.noarch/net/mac80211/wep.h.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/wep.h 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/wep.h.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/wep.h 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,40 @@
+/*
+ * Software WEP encryption implementation
@@ -4479,8 +4609,8 @@
+u8 * ieee80211_wep_is_weak_iv(struct sk_buff *skb, struct ieee80211_key *key);
+
+#endif /* WEP_H */
---- linux-2.6.21.noarch/net/mac80211/ieee80211_iface.c.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/ieee80211_iface.c 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/ieee80211_iface.c.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/ieee80211_iface.c 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,352 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -4834,8 +4964,8 @@
+ ieee80211_if_sdata_deinit(sdata);
+ free_netdev(dev);
+}
---- linux-2.6.21.noarch/net/mac80211/ieee80211_ioctl.c.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/ieee80211_ioctl.c 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/ieee80211_ioctl.c.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/ieee80211_ioctl.c 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,1822 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -6659,8 +6789,8 @@
+ .private_args = (struct iw_priv_args *) ieee80211_ioctl_priv,
+ .get_wireless_stats = ieee80211_get_wireless_stats,
+};
---- linux-2.6.21.noarch/net/mac80211/debugfs_sta.c.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/debugfs_sta.c 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/debugfs_sta.c.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/debugfs_sta.c 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,246 @@
+/*
+ * Copyright 2003-2005 Devicescape Software, Inc.
@@ -6908,8 +7038,8 @@
+ debugfs_remove(sta->debugfs.dir);
+ sta->debugfs.dir = NULL;
+}
---- linux-2.6.21.noarch/net/mac80211/ieee80211_rate.c.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/ieee80211_rate.c 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/ieee80211_rate.c.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/ieee80211_rate.c 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,140 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -7051,8 +7181,8 @@
+{
+ kref_put(&ref->kref, rate_control_release);
+}
---- linux-2.6.21.noarch/net/mac80211/debugfs_key.c.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/debugfs_key.c 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/debugfs_key.c.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/debugfs_key.c 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,252 @@
+/*
+ * Copyright 2003-2005 Devicescape Software, Inc.
@@ -7306,8 +7436,8 @@
+ debugfs_remove(key->debugfs.stalink);
+ key->debugfs.stalink = NULL;
+}
---- linux-2.6.21.noarch/net/mac80211/ieee80211_led.h.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/ieee80211_led.h 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/ieee80211_led.h.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/ieee80211_led.h 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2006, Johannes Berg <johannes at sipsolutions.net>
@@ -7341,8 +7471,8 @@
+{
+}
+#endif
---- linux-2.6.21.noarch/net/mac80211/Makefile.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/Makefile 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/Makefile.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/Makefile 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,20 @@
+obj-$(CONFIG_MAC80211) += mac80211.o rc80211_simple.o
+
@@ -7364,8 +7494,8 @@
+ wme.o \
+ ieee80211_cfg.o \
+ $(mac80211-objs-y)
---- linux-2.6.21.noarch/net/mac80211/debugfs_sta.h.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/debugfs_sta.h 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/debugfs_sta.h.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/debugfs_sta.h 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,12 @@
+#ifndef __MAC80211_DEBUGFS_STA_H
+#define __MAC80211_DEBUGFS_STA_H
@@ -7379,8 +7509,8 @@
+#endif
+
+#endif /* __MAC80211_DEBUGFS_STA_H */
---- linux-2.6.21.noarch/net/mac80211/hostapd_ioctl.h.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/hostapd_ioctl.h 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/hostapd_ioctl.h.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/hostapd_ioctl.h 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,108 @@
+/*
+ * Host AP (software wireless LAN access point) user space daemon for
@@ -7490,8 +7620,8 @@
+};
+
+#endif /* HOSTAPD_IOCTL_H */
---- linux-2.6.21.noarch/net/mac80211/ieee80211_common.h.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/ieee80211_common.h 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/ieee80211_common.h.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/ieee80211_common.h 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,98 @@
+/*
+ * IEEE 802.11 driver (80211.o) -- hostapd interface
@@ -7591,8 +7721,8 @@
+};
+
+#endif /* IEEE80211_COMMON_H */
---- linux-2.6.21.noarch/net/mac80211/debugfs.c.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/debugfs.c 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/debugfs.c.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/debugfs.c 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,433 @@
+/*
+ * mac80211 debugfs for wireless PHYs
@@ -8027,8 +8157,8 @@
+ debugfs_remove(local->debugfs.keys);
+ local->debugfs.keys = NULL;
+}
---- linux-2.6.21.noarch/net/mac80211/debugfs_netdev.h.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/debugfs_netdev.h 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/debugfs_netdev.h.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/debugfs_netdev.h 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,30 @@
+/* routines exported for debugfs handling */
+
@@ -8060,8 +8190,8 @@
+#endif
+
+#endif /* __IEEE80211_DEBUGFS_NETDEV_H */
---- linux-2.6.21.noarch/net/mac80211/tkip.c.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/tkip.c 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/tkip.c.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/tkip.c 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,341 @@
+/*
+ * Copyright 2002-2004, Instant802 Networks, Inc.
@@ -8404,8 +8534,8 @@
+}
+
+
---- linux-2.6.21.noarch/net/mac80211/ieee80211.c.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/ieee80211.c 2007-06-07 14:01:53.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/ieee80211.c.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/ieee80211.c 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,4989 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -13396,8 +13526,8 @@
+
+MODULE_DESCRIPTION("IEEE 802.11 subsystem");
+MODULE_LICENSE("GPL");
---- linux-2.6.21.noarch/net/mac80211/wme.c.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/wme.c 2007-06-07 13:59:20.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/wme.c.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/wme.c 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,681 @@
+/*
+ * Copyright 2004, Instant802 Networks, Inc.
@@ -14080,8 +14210,8 @@
+ unregister_qdisc(&wme_qdisc_ops);
+}
+#endif /* CONFIG_NET_SCHED */
---- linux-2.6.21.noarch/net/mac80211/aes_ccm.h.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/aes_ccm.h 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/aes_ccm.h.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/aes_ccm.h 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2003-2004, Instant802 Networks, Inc.
@@ -14109,8 +14239,8 @@
+void ieee80211_aes_key_free(struct crypto_cipher *tfm);
+
+#endif /* AES_CCM_H */
---- linux-2.6.21.noarch/net/mac80211/ieee80211_key.h.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/ieee80211_key.h 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/ieee80211_key.h.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/ieee80211_key.h 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2002-2004, Instant802 Networks, Inc.
@@ -14218,8 +14348,8 @@
+};
+
+#endif /* IEEE80211_KEY_H */
---- linux-2.6.21.noarch/net/mac80211/rc80211_simple.c.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/rc80211_simple.c 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/rc80211_simple.c.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/rc80211_simple.c 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,432 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -14653,8 +14783,8 @@
+
+MODULE_DESCRIPTION("Simple rate control algorithm for ieee80211");
+MODULE_LICENSE("GPL");
---- linux-2.6.21.noarch/net/mac80211/debugfs_key.h.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/debugfs_key.h 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/debugfs_key.h.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/debugfs_key.h 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,34 @@
+#ifndef __MAC80211_DEBUGFS_KEY_H
+#define __MAC80211_DEBUGFS_KEY_H
@@ -14690,8 +14820,8 @@
+#endif
+
+#endif /* __MAC80211_DEBUGFS_KEY_H */
---- linux-2.6.21.noarch/net/mac80211/ieee80211_cfg.h.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/ieee80211_cfg.h 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/ieee80211_cfg.h.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/ieee80211_cfg.h 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,9 @@
+/*
+ * mac80211 configuration hooks for cfg80211
@@ -14702,8 +14832,8 @@
+extern struct cfg80211_ops mac80211_config_ops;
+
+#endif /* __IEEE80211_CFG_H */
---- linux-2.6.21.noarch/net/mac80211/ieee80211_rate.h.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/ieee80211_rate.h 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/ieee80211_rate.h.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/ieee80211_rate.h 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -14849,8 +14979,8 @@
+}
+
+#endif /* IEEE80211_RATE_H */
---- linux-2.6.21.noarch/net/mac80211/Kconfig.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/Kconfig 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/Kconfig.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/Kconfig 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,78 @@
+config MAC80211
+ tristate "Generic IEEE 802.11 Networking Stack (mac80211)"
@@ -14930,8 +15060,8 @@
+ ---help---
+ Say Y here to print out verbose powersave
+ mode debug messages.
---- linux-2.6.21.noarch/net/mac80211/ieee80211_i.h.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/ieee80211_i.h 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/ieee80211_i.h.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/ieee80211_i.h 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,798 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -15731,8 +15861,8 @@
+extern void *mac80211_wiphy_privid;
+
+#endif /* IEEE80211_I_H */
---- linux-2.6.21.noarch/net/mac80211/tkip.h.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/tkip.h 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/tkip.h.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/tkip.h 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2002-2004, Instant802 Networks, Inc.
@@ -15770,8 +15900,8 @@
+ int only_iv, int queue);
+
+#endif /* TKIP_H */
---- linux-2.6.21.noarch/net/mac80211/michael.c.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/michael.c 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/michael.c.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/michael.c 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,104 @@
+/*
+ * Michael MIC implementation - optimized for TKIP MIC operations
@@ -15877,8 +16007,8 @@
+ michael_put32(l, mic);
+ michael_put32(r, mic + 4);
+}
---- linux-2.6.21.noarch/net/mac80211/ieee80211_cfg.c.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/ieee80211_cfg.c 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/ieee80211_cfg.c.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/ieee80211_cfg.c 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,66 @@
+/*
+ * mac80211 configuration hooks for cfg80211
@@ -15946,8 +16076,8 @@
+ .add_virtual_intf = ieee80211_add_iface,
+ .del_virtual_intf = ieee80211_del_iface,
+};
---- linux-2.6.21.noarch/net/mac80211/ieee80211_sta.c.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/ieee80211_sta.c 2007-06-07 14:02:27.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/ieee80211_sta.c.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/ieee80211_sta.c 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,3060 @@
+/*
+ * BSS client mode implementation
@@ -19009,8 +19139,8 @@
+ ieee80211_set_disassoc(dev, ifsta, 0);
+ return 0;
+}
---- linux-2.6.21.noarch/net/mac80211/debugfs.h.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/debugfs.h 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/debugfs.h.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/debugfs.h 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,16 @@
+#ifndef __MAC80211_DEBUGFS_H
+#define __MAC80211_DEBUGFS_H
@@ -19028,8 +19158,8 @@
+#endif
+
+#endif /* __MAC80211_DEBUGFS_H */
---- linux-2.6.21.noarch/net/mac80211/ieee80211_led.c.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/ieee80211_led.c 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/ieee80211_led.c.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/ieee80211_led.c 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2006, Johannes Berg <johannes at sipsolutions.net>
@@ -19122,8 +19252,8 @@
+ return NULL;
+}
+EXPORT_SYMBOL(__ieee80211_get_rx_led_name);
---- linux-2.6.21.noarch/net/mac80211/sta_info.h.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/sta_info.h 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/sta_info.h.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/sta_info.h 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,164 @@
+/*
+ * Copyright 2002-2005, Devicescape Software, Inc.
@@ -19289,8 +19419,8 @@
+void sta_info_flush(struct ieee80211_local *local, struct net_device *dev);
+
+#endif /* STA_INFO_H */
---- linux-2.6.21.noarch/net/mac80211/sta_info.c.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/sta_info.c 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/sta_info.c.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/sta_info.c 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,470 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -19762,8 +19892,8 @@
+ sta_info_free(sta, 1);
+ spin_unlock_bh(&local->sta_lock);
+}
---- linux-2.6.21.noarch/net/mac80211/aes_ccm.c.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/aes_ccm.c 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/aes_ccm.c.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/aes_ccm.c 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,155 @@
+/*
+ * Copyright 2003-2004, Instant802 Networks, Inc.
@@ -19920,8 +20050,8 @@
+ if (tfm)
+ crypto_free_cipher(tfm);
+}
---- linux-2.6.21.noarch/net/mac80211/wep.c.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/wep.c 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/wep.c.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/wep.c 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,328 @@
+/*
+ * Software WEP encryption implementation
@@ -20251,8 +20381,8 @@
+
+ return NULL;
+}
---- linux-2.6.21.noarch/net/mac80211/wpa.h.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/wpa.h 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/wpa.h.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/wpa.h 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2002-2004, Instant802 Networks, Inc.
@@ -20285,8 +20415,8 @@
+ieee80211_rx_h_ccmp_decrypt(struct ieee80211_txrx_data *rx);
+
+#endif /* WPA_H */
---- linux-2.6.21.noarch/net/mac80211/michael.h.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/michael.h 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/michael.h.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/michael.h 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,20 @@
+/*
+ * Michael MIC implementation - optimized for TKIP MIC operations
@@ -20308,8 +20438,8 @@
+ u8 *data, size_t data_len, u8 *mic);
+
+#endif /* MICHAEL_H */
---- linux-2.6.21.noarch/net/mac80211/debugfs_netdev.c.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/debugfs_netdev.c 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/debugfs_netdev.c.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/debugfs_netdev.c 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,440 @@
+/*
+ * Copyright (c) 2006 Jiri Benc <jbenc at suse.cz>
@@ -20751,8 +20881,8 @@
+ unregister_netdevice_notifier(&mac80211_debugfs_netdev_notifier);
+ notif_registered = 0;
+}
---- linux-2.6.21.noarch/net/mac80211/wpa.c.orig 2007-06-07 13:56:27.000000000 -0400
-+++ linux-2.6.21.noarch/net/mac80211/wpa.c 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/mac80211/wpa.c.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/mac80211/wpa.c 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,660 @@
+/*
+ * Copyright 2002-2004, Instant802 Networks, Inc.
@@ -21414,8 +21544,8 @@
+ return TXRX_CONTINUE;
+}
+
---- linux-2.6.21.noarch/net/Kconfig.orig 2007-06-07 13:55:49.000000000 -0400
-+++ linux-2.6.21.noarch/net/Kconfig 2007-06-07 13:56:07.000000000 -0400
+--- linux-2.6.21.noarch/net/Kconfig.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/Kconfig 2007-06-14 13:40:57.000000000 -0400
@@ -219,14 +219,18 @@ endmenu
source "net/ax25/Kconfig"
source "net/irda/Kconfig"
@@ -21439,8 +21569,8 @@
endif # if NET
endmenu # Networking
---- linux-2.6.21.noarch/net/wireless/wext.c.orig 2007-06-07 13:55:56.000000000 -0400
-+++ linux-2.6.21.noarch/net/wireless/wext.c 2007-06-07 13:55:56.000000000 -0400
+--- linux-2.6.21.noarch/net/wireless/wext.c.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/wireless/wext.c 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,1509 @@
+/*
+ * This file implement the Wireless Extensions APIs.
@@ -22951,15 +23081,15 @@
+ }
+}
+EXPORT_SYMBOL(wireless_spy_update);
---- linux-2.6.21.noarch/net/wireless/Makefile.orig 2007-06-07 13:55:56.000000000 -0400
-+++ linux-2.6.21.noarch/net/wireless/Makefile 2007-06-07 13:55:56.000000000 -0400
+--- linux-2.6.21.noarch/net/wireless/Makefile.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/wireless/Makefile 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,4 @@
+obj-$(CONFIG_WIRELESS_EXT) += wext.o
+obj-$(CONFIG_CFG80211) += cfg80211.o
+
+cfg80211-y += core.o sysfs.o
---- linux-2.6.21.noarch/net/wireless/core.h.orig 2007-06-07 13:55:56.000000000 -0400
-+++ linux-2.6.21.noarch/net/wireless/core.h 2007-06-07 13:55:56.000000000 -0400
+--- linux-2.6.21.noarch/net/wireless/core.h.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/wireless/core.h 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,49 @@
+/*
+ * Wireless configuration interface internals.
@@ -23010,8 +23140,8 @@
+extern void cfg80211_dev_free(struct cfg80211_registered_device *drv);
+
+#endif /* __NET_WIRELESS_CORE_H */
---- linux-2.6.21.noarch/net/wireless/core.c.orig 2007-06-07 13:55:56.000000000 -0400
-+++ linux-2.6.21.noarch/net/wireless/core.c 2007-06-07 13:55:56.000000000 -0400
+--- linux-2.6.21.noarch/net/wireless/core.c.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/wireless/core.c 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,224 @@
+/*
+ * This is the linux wireless configuration interface.
@@ -23237,8 +23367,8 @@
+ wiphy_sysfs_exit();
+}
+module_exit(cfg80211_exit);
---- linux-2.6.21.noarch/net/wireless/Kconfig.orig 2007-06-07 13:55:56.000000000 -0400
-+++ linux-2.6.21.noarch/net/wireless/Kconfig 2007-06-07 13:55:56.000000000 -0400
+--- linux-2.6.21.noarch/net/wireless/Kconfig.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/wireless/Kconfig 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,16 @@
+config CFG80211
+ tristate "Improved wireless configuration API"
@@ -23256,8 +23386,8 @@
+
+ Say N (if you can) unless you know you need wireless
+ extensions for external modules.
---- linux-2.6.21.noarch/net/wireless/sysfs.c.orig 2007-06-07 13:55:56.000000000 -0400
-+++ linux-2.6.21.noarch/net/wireless/sysfs.c 2007-06-07 13:55:56.000000000 -0400
+--- linux-2.6.21.noarch/net/wireless/sysfs.c.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/wireless/sysfs.c 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,80 @@
+/*
+ * This file provides /sys/class/ieee80211/<wiphy name>/
@@ -23339,8 +23469,8 @@
+{
+ class_unregister(&ieee80211_class);
+}
---- linux-2.6.21.noarch/net/wireless/sysfs.h.orig 2007-06-07 13:55:56.000000000 -0400
-+++ linux-2.6.21.noarch/net/wireless/sysfs.h 2007-06-07 13:55:56.000000000 -0400
+--- linux-2.6.21.noarch/net/wireless/sysfs.h.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/net/wireless/sysfs.h 2007-06-14 13:40:57.000000000 -0400
@@ -0,0 +1,9 @@
+#ifndef __WIRELESS_SYSFS_H
+#define __WIRELESS_SYSFS_H
@@ -23351,8 +23481,8 @@
+extern struct class ieee80211_class;
+
+#endif /* __WIRELESS_SYSFS_H */
---- linux-2.6.21.noarch/drivers/net/Makefile.orig 2007-06-07 13:55:49.000000000 -0400
-+++ linux-2.6.21.noarch/drivers/net/Makefile 2007-06-07 13:55:56.000000000 -0400
+--- linux-2.6.21.noarch/drivers/net/Makefile.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/drivers/net/Makefile 2007-06-14 13:40:57.000000000 -0400
@@ -211,7 +211,7 @@ obj-$(CONFIG_TR) += tokenring/
obj-$(CONFIG_WAN) += wan/
obj-$(CONFIG_ARCNET) += arcnet/
@@ -23362,8 +23492,8 @@
obj-$(CONFIG_NET_TULIP) += tulip/
obj-$(CONFIG_HAMRADIO) += hamradio/
obj-$(CONFIG_IRDA) += irda/
---- linux-2.6.21.noarch/drivers/net/wireless/zd1211rw/Kconfig.orig 2007-06-07 13:55:49.000000000 -0400
-+++ linux-2.6.21.noarch/drivers/net/wireless/zd1211rw/Kconfig 2007-06-07 13:55:56.000000000 -0400
+--- linux-2.6.21.noarch/drivers/net/wireless/zd1211rw/Kconfig.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/drivers/net/wireless/zd1211rw/Kconfig 2007-06-14 13:40:57.000000000 -0400
@@ -1,6 +1,7 @@
config ZD1211RW
tristate "ZyDAS ZD1211/ZD1211B USB-wireless support"
@@ -23373,8 +23503,8 @@
select FW_LOADER
---help---
This is an experimental driver for the ZyDAS ZD1211/ZD1211B wireless
---- linux-2.6.21.noarch/drivers/net/wireless/Kconfig.orig 2007-06-07 13:55:49.000000000 -0400
-+++ linux-2.6.21.noarch/drivers/net/wireless/Kconfig 2007-06-07 13:55:56.000000000 -0400
+--- linux-2.6.21.noarch/drivers/net/wireless/Kconfig.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/drivers/net/wireless/Kconfig 2007-06-14 13:40:57.000000000 -0400
@@ -2,47 +2,21 @@
# Wireless LAN device configuration
#
@@ -23639,8 +23769,8 @@
-
endmenu
-
---- linux-2.6.21.noarch/drivers/net/wireless/bcm43xx/Kconfig.orig 2007-06-07 13:55:49.000000000 -0400
-+++ linux-2.6.21.noarch/drivers/net/wireless/bcm43xx/Kconfig 2007-06-07 13:55:56.000000000 -0400
+--- linux-2.6.21.noarch/drivers/net/wireless/bcm43xx/Kconfig.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/drivers/net/wireless/bcm43xx/Kconfig 2007-06-14 13:40:57.000000000 -0400
@@ -1,6 +1,7 @@
config BCM43XX
tristate "Broadcom BCM43xx wireless support"
@@ -23650,8 +23780,8 @@
select FW_LOADER
select HW_RANDOM
---help---
---- linux-2.6.21.noarch/drivers/net/wireless/hostap/Kconfig.orig 2007-06-07 13:55:49.000000000 -0400
-+++ linux-2.6.21.noarch/drivers/net/wireless/hostap/Kconfig 2007-06-07 13:55:56.000000000 -0400
+--- linux-2.6.21.noarch/drivers/net/wireless/hostap/Kconfig.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/drivers/net/wireless/hostap/Kconfig 2007-06-14 13:40:57.000000000 -0400
@@ -1,6 +1,7 @@
config HOSTAP
tristate "IEEE 802.11 for Host AP (Prism2/2.5/3 and WEP/TKIP/CCMP)"
@@ -23661,8 +23791,8 @@
select IEEE80211
select IEEE80211_CRYPT_WEP
---help---
---- linux-2.6.21.noarch/Documentation/feature-removal-schedule.txt.orig 2007-06-07 13:55:49.000000000 -0400
-+++ linux-2.6.21.noarch/Documentation/feature-removal-schedule.txt 2007-06-07 13:55:56.000000000 -0400
+--- linux-2.6.21.noarch/Documentation/feature-removal-schedule.txt.orig 2007-06-14 13:40:38.000000000 -0400
++++ linux-2.6.21.noarch/Documentation/feature-removal-schedule.txt 2007-06-14 13:40:57.000000000 -0400
@@ -294,18 +294,6 @@ Who: Richard Purdie <rpurdie at rpsys.net>
---------------------------
--- git-iwlwifi.patch DELETED ---
More information about the fedora-extras-commits
mailing list