rpms/kernel/devel git-wireless-dev.patch, 1.22, 1.23 kernel.spec, 1.27, 1.28

John W. Linville (linville) fedora-extras-commits at redhat.com
Mon Jul 23 12:54:45 UTC 2007


Author: linville

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28550

Modified Files:
	git-wireless-dev.patch kernel.spec 
Log Message:
rediff git-wireless-dev.patch

git-wireless-dev.patch:

Index: git-wireless-dev.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/git-wireless-dev.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- git-wireless-dev.patch	20 Jul 2007 20:38:04 -0000	1.22
+++ git-wireless-dev.patch	23 Jul 2007 12:54:41 -0000	1.23
@@ -1,5 +1,5 @@
---- linux-2.6.22.noarch/CREDITS.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/CREDITS	2007-07-20 16:29:44.000000000 -0400
+--- linux-2.6.22.noarch/CREDITS.orig	2007-07-23 08:31:27.000000000 -0400
++++ linux-2.6.22.noarch/CREDITS	2007-07-23 08:36:33.000000000 -0400
 @@ -665,6 +665,11 @@ D: Minor updates to SCSI types, added /p
  S: (ask for current address)
  S: USA
@@ -67,7 +67,7 @@
  E: liw at iki.fi
  D: Linux System Administrator's Guide, author, former maintainer
 --- linux-2.6.22.noarch/include/linux/nl80211.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/nl80211.h	2007-07-20 16:29:44.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/nl80211.h	2007-07-23 08:36:33.000000000 -0400
 @@ -7,6 +7,201 @@
   */
  
@@ -327,8 +327,8 @@
 +#define NL80211_KEYTYPE_MAX (__NL80211_KEYTYPE_AFTER_LAST - 1)
 +
  #endif /* __LINUX_NL80211_H */
---- linux-2.6.22.noarch/include/linux/ieee80211.h.orig	2007-07-20 16:28:51.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/ieee80211.h	2007-07-20 16:29:44.000000000 -0400
+--- linux-2.6.22.noarch/include/linux/ieee80211.h.orig	2007-07-23 08:31:46.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/ieee80211.h	2007-07-23 08:36:33.000000000 -0400
 @@ -106,6 +106,75 @@ struct ieee80211_hdr {
  } __attribute__ ((packed));
  
@@ -627,8 +627,8 @@
 +};
 +
  #endif /* IEEE80211_H */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h	2007-07-20 16:29:45.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h	2007-07-23 08:36:33.000000000 -0400
 @@ -0,0 +1,387 @@
 +#ifndef LINUX_SSB_CHIPCO_H_
 +#define LINUX_SSB_CHIPCO_H_
@@ -1017,8 +1017,8 @@
 +
 +#endif /* __KERNEL__ */
 +#endif /* LINUX_SSB_CHIPCO_H_ */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h	2007-07-20 16:29:45.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h	2007-07-23 08:36:33.000000000 -0400
 @@ -0,0 +1,163 @@
 +/*
 + * Hardware-specific External Interface I/O core definitions
@@ -1183,8 +1183,8 @@
 +
 +#endif /* __KERNEL__ */
 +#endif /* LINUX_SSB_EXTIFCORE_H_ */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h	2007-07-20 16:29:45.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h	2007-07-23 08:36:33.000000000 -0400
 @@ -0,0 +1,47 @@
 +#ifndef LINUX_SSB_MIPSCORE_H_
 +#define LINUX_SSB_MIPSCORE_H_
@@ -1233,8 +1233,8 @@
 +
 +#endif /* __KERNEL__ */
 +#endif /* LINUX_SSB_MIPSCORE_H_ */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h	2007-07-20 16:29:45.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h	2007-07-23 08:36:33.000000000 -0400
 @@ -0,0 +1,294 @@
 +#ifndef LINUX_SSB_REGS_H_
 +#define LINUX_SSB_REGS_H_
@@ -1530,8 +1530,8 @@
 +
 +#endif /* __KERNEL__ */
 +#endif /* LINUX_SSB_REGS_H_ */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h	2007-07-20 16:29:45.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h	2007-07-23 08:36:33.000000000 -0400
 @@ -0,0 +1,108 @@
 +#ifndef LINUX_SSB_PCICORE_H_
 +#define LINUX_SSB_PCICORE_H_
@@ -1641,8 +1641,8 @@
 +#endif /* CONFIG_SSB_DRIVER_PCICORE */
 +#endif /* __KERNEL__ */
 +#endif /* LINUX_SSB_PCICORE_H_ */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb.h	2007-07-23 08:36:33.000000000 -0400
 @@ -0,0 +1,422 @@
 +#ifndef LINUX_SSB_H_
 +#define LINUX_SSB_H_
@@ -2066,8 +2066,8 @@
 +
 +#endif /* __KERNEL__ */
 +#endif /* LINUX_SSB_H_ */
---- linux-2.6.22.noarch/include/net/cfg80211.h.orig	2007-07-20 16:28:51.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/cfg80211.h	2007-07-20 16:29:45.000000000 -0400
+--- linux-2.6.22.noarch/include/net/cfg80211.h.orig	2007-07-23 08:31:46.000000000 -0400
++++ linux-2.6.22.noarch/include/net/cfg80211.h	2007-07-23 08:36:33.000000000 -0400
 @@ -3,6 +3,7 @@
  
  #include <linux/netlink.h>
@@ -2210,8 +2210,8 @@
 +			    u32 seq, int flags, u8 cmd);
 +
  #endif /* __NET_CFG80211_H */
---- linux-2.6.22.noarch/include/net/mac80211.h.orig	2007-07-20 16:28:51.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/mac80211.h	2007-07-20 16:29:45.000000000 -0400
+--- linux-2.6.22.noarch/include/net/mac80211.h.orig	2007-07-23 08:31:46.000000000 -0400
++++ linux-2.6.22.noarch/include/net/mac80211.h	2007-07-23 08:36:33.000000000 -0400
 @@ -300,7 +300,6 @@ struct ieee80211_conf {
  	/* Following five fields are used for IEEE 802.11H */
  	unsigned int radar_detect;
@@ -2376,7 +2376,7 @@
  					int rate);
  
 --- linux-2.6.22.noarch/include/net/iw_handler.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/iw_handler.h	2007-07-20 16:29:45.000000000 -0400
++++ linux-2.6.22.noarch/include/net/iw_handler.h	2007-07-23 08:36:33.000000000 -0400
 @@ -431,7 +431,13 @@ struct iw_public_data {
   * Those may be called only within the kernel.
   */
@@ -2392,8 +2392,8 @@
  
  /* Send a single event to user space */
  extern void wireless_send_event(struct net_device *	dev,
---- linux-2.6.22.noarch/MAINTAINERS.orig	2007-07-20 16:28:49.000000000 -0400
-+++ linux-2.6.22.noarch/MAINTAINERS	2007-07-20 16:29:44.000000000 -0400
+--- linux-2.6.22.noarch/MAINTAINERS.orig	2007-07-23 08:31:28.000000000 -0400
++++ linux-2.6.22.noarch/MAINTAINERS	2007-07-23 08:36:33.000000000 -0400
 @@ -277,6 +277,14 @@ M:	corentin.labbe at geomatys.fr
  L:	lm-sensors at lm-sensors.org
  S:	Maintained
@@ -2409,7 +2409,7 @@
  ADT746X FAN DRIVER
  P:	Colin Leroy
  M:	colin at colino.net
-@@ -767,6 +775,15 @@ L:	linux-hams at vger.kernel.org
+@@ -778,6 +786,15 @@ L:	linux-hams at vger.kernel.org
  W:	http://www.baycom.org/~tom/ham/ham.html
  S:	Maintained
  
@@ -2425,7 +2425,7 @@
  BCM43XX WIRELESS DRIVER (SOFTMAC BASED VERSION)
  P:	Larry Finger
  M:	Larry.Finger at lwfinger.net
-@@ -914,6 +931,12 @@ M:	zambrano at broadcom.com
+@@ -925,6 +942,12 @@ M:	zambrano at broadcom.com
  L:	netdev at vger.kernel.org
  S:	Supported
  
@@ -2438,7 +2438,7 @@
  BROADCOM BNX2 GIGABIT ETHERNET DRIVER
  P:	Michael Chan
  M:	mchan at broadcom.com
-@@ -2030,6 +2053,16 @@ L:	http://lists.sourceforge.net/mailman/
+@@ -2041,6 +2064,16 @@ L:	http://lists.sourceforge.net/mailman/
  W:	http://ipw2200.sourceforge.net
  S:	Supported
  
@@ -2455,7 +2455,7 @@
  IOC3 DRIVER
  P:	Ralf Baechle
  M:	ralf at linux-mips.org
-@@ -2977,6 +3010,15 @@ L:	kpreempt-tech at lists.sourceforge.net
+@@ -2988,6 +3021,15 @@ L:	kpreempt-tech at lists.sourceforge.net
  W:	ftp://ftp.kernel.org/pub/linux/kernel/people/rml/preempt-kernel
  S:	Supported
  
@@ -2471,7 +2471,7 @@
  PRISM54 WIRELESS DRIVER
  P:	Luis R. Rodriguez
  M:	mcgrof at gmail.com
-@@ -3064,6 +3106,13 @@ M:	corey at world.std.com
+@@ -3075,6 +3117,13 @@ M:	corey at world.std.com
  L:	linux-wireless at vger.kernel.org
  S:	Maintained
  
@@ -2485,7 +2485,7 @@
  RANDOM NUMBER DRIVER
  P:	Matt Mackall
  M:	mpm at selenic.com
-@@ -3380,6 +3429,12 @@ M:	tsbogend at alpha.franken.de
+@@ -3391,6 +3440,12 @@ M:	tsbogend at alpha.franken.de
  L:	netdev at vger.kernel.org
  S:	Maintained
  
@@ -2498,8 +2498,8 @@
  SONY VAIO CONTROL DEVICE DRIVER
  P:	Mattia Dongili
  M:	malattia at linux.it
---- linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c.orig	2007-07-20 16:28:51.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c	2007-07-20 16:29:45.000000000 -0400
+--- linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c.orig	2007-07-23 08:31:47.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_iface.c	2007-07-23 08:36:33.000000000 -0400
 @@ -184,14 +184,31 @@ void ieee80211_if_set_type(struct net_de
  			    (unsigned long) sdata);
  		skb_queue_head_init(&ifsta->skb_queue);
@@ -2532,8 +2532,8 @@
  		msdata = IEEE80211_DEV_TO_SUB_IF(sdata->local->mdev);
  		sdata->bss = &msdata->u.ap;
  		break;
---- linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c.orig	2007-07-20 16:28:51.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c	2007-07-20 16:29:45.000000000 -0400
+--- linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c.orig	2007-07-23 08:31:48.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c	2007-07-23 08:36:33.000000000 -0400
 @@ -27,12 +27,411 @@
  #include "aes_ccm.h"
  #include "debugfs_key.h"
@@ -4163,7 +4163,7 @@
  
  static const iw_handler ieee80211_handler[] =
 --- linux-2.6.22.noarch/net/mac80211/debugfs_sta.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/debugfs_sta.c	2007-07-20 16:29:45.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/debugfs_sta.c	2007-07-23 08:36:33.000000000 -0400
 @@ -87,7 +87,7 @@ static ssize_t sta_flags_read(struct fil
  {
  	char buf[100];
@@ -4190,16 +4190,16 @@
  	p += scnprintf(p, sizeof(buf)+buf-p, "\n");
  	return simple_read_from_buffer(userbuf, count, ppos, buf, p - buf);
  }
---- linux-2.6.22.noarch/net/mac80211/Makefile.orig	2007-07-20 16:28:51.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/Makefile	2007-07-20 16:29:45.000000000 -0400
+--- linux-2.6.22.noarch/net/mac80211/Makefile.orig	2007-07-23 08:31:47.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/Makefile	2007-07-23 08:36:33.000000000 -0400
 @@ -1,4 +1,4 @@
 -obj-$(CONFIG_MAC80211) += mac80211.o rc80211_simple.o
 +obj-$(CONFIG_MAC80211) += mac80211.o rc80211_simple.o rc80211_lowest.o
  
  mac80211-objs-$(CONFIG_MAC80211_LEDS) += ieee80211_led.o
  mac80211-objs-$(CONFIG_MAC80211_DEBUGFS) += debugfs.o debugfs_sta.o debugfs_netdev.o debugfs_key.o
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/net/mac80211/rc80211_lowest.c	2007-07-20 16:29:45.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/net/mac80211/rc80211_lowest.c	2007-07-23 08:36:33.000000000 -0400
 @@ -0,0 +1,105 @@
 +/*
 + * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -4306,8 +4306,8 @@
 +
 +MODULE_DESCRIPTION("Forced 1 mbps rate control module for mac80211");
 +MODULE_LICENSE("GPL");
---- linux-2.6.22.noarch/net/mac80211/hostapd_ioctl.h.orig	2007-07-20 16:28:51.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/hostapd_ioctl.h	2007-07-20 16:29:45.000000000 -0400
+--- linux-2.6.22.noarch/net/mac80211/hostapd_ioctl.h.orig	2007-07-23 08:31:47.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/hostapd_ioctl.h	2007-07-23 08:36:33.000000000 -0400
 @@ -25,6 +25,11 @@
   * This table is no longer added to, the whole sub-ioctl
   * mess shall be deleted completely. */
@@ -4581,7 +4581,7 @@
  	HOSTAP_IF_WDS = 1, HOSTAP_IF_VLAN = 2, HOSTAP_IF_BSS = 3,
  	HOSTAP_IF_STA = 4
 --- linux-2.6.22.noarch/net/mac80211/debugfs.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/debugfs.c	2007-07-20 16:29:45.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/debugfs.c	2007-07-23 08:36:33.000000000 -0400
 @@ -13,6 +13,16 @@
  #include "ieee80211_rate.h"
  #include "debugfs.h"
@@ -4697,8 +4697,8 @@
  	DEBUGFS_DEL(modes);
  
  	DEBUGFS_STATS_DEL(transmitted_fragment_count);
---- linux-2.6.22.noarch/net/mac80211/ieee80211.c.orig	2007-07-20 16:28:51.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211.c	2007-07-20 16:29:45.000000000 -0400
+--- linux-2.6.22.noarch/net/mac80211/ieee80211.c.orig	2007-07-23 08:31:47.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211.c	2007-07-23 08:36:33.000000000 -0400
 @@ -455,12 +455,6 @@ ieee80211_tx_h_rate_ctrl(struct ieee8021
  		tx->u.tx.control->rate = tx->u.tx.rate;
  	}
@@ -5120,7 +5120,7 @@
  	dev->change_mtu = ieee80211_change_mtu;
  	dev->get_stats = ieee80211_get_stats;
 --- linux-2.6.22.noarch/net/mac80211/wme.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/wme.c	2007-07-20 16:29:45.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/wme.c	2007-07-23 08:36:33.000000000 -0400
 @@ -29,12 +29,18 @@ ieee80211_rx_h_parse_qos(struct ieee8021
  {
  	u8 *data = rx->skb->data;
@@ -5217,7 +5217,7 @@
  		}
  	}
 --- linux-2.6.22.noarch/net/mac80211/Kconfig.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/Kconfig	2007-07-20 16:29:45.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/Kconfig	2007-07-23 08:36:33.000000000 -0400
 @@ -64,6 +64,10 @@ config MAC80211_DEBUG_COUNTERS
  	bool "Extra statistics for TX/RX debugging"
  	depends on MAC80211_DEBUG
@@ -5229,8 +5229,8 @@
  config MAC80211_IBSS_DEBUG
  	bool "Support for IBSS testing"
  	depends on MAC80211_DEBUG
---- linux-2.6.22.noarch/net/mac80211/ieee80211_i.h.orig	2007-07-20 16:28:51.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_i.h	2007-07-20 16:29:45.000000000 -0400
+--- linux-2.6.22.noarch/net/mac80211/ieee80211_i.h.orig	2007-07-23 08:31:47.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_i.h	2007-07-23 08:36:33.000000000 -0400
 @@ -59,6 +59,10 @@ struct ieee80211_local;
   * increased memory use (about 2 kB of RAM per entry). */
  #define IEEE80211_FRAGMENT_MAX 4
@@ -5475,7 +5475,7 @@
  /* ieee80211_iface.c */
  int ieee80211_if_add(struct net_device *dev, const char *name,
 --- linux-2.6.22.noarch/net/mac80211/ieee80211_cfg.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_cfg.c	2007-07-20 16:29:45.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_cfg.c	2007-07-23 08:36:33.000000000 -0400
 @@ -13,7 +13,7 @@
  #include "ieee80211_cfg.h"
  
@@ -5498,8 +5498,8 @@
  	case NL80211_IFTYPE_MONITOR:
  		itype = IEEE80211_IF_TYPE_MNTR;
  		break;
---- linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c.orig	2007-07-20 16:28:51.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c	2007-07-20 16:29:45.000000000 -0400
+--- linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c.orig	2007-07-23 08:31:48.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c	2007-07-23 08:36:33.000000000 -0400
 @@ -58,6 +58,9 @@
  
  #define ERP_INFO_USE_PROTECTION BIT(1)
@@ -6651,7 +6651,7 @@
  			rate->val2 : rate->val;
  		control.antenna_sel_tx = local->hw.conf.antenna_sel_tx;
 --- linux-2.6.22.noarch/net/mac80211/sta_info.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/sta_info.h	2007-07-20 16:29:45.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/sta_info.h	2007-07-23 08:36:33.000000000 -0400
 @@ -27,6 +27,7 @@
  				    */
  #define WLAN_STA_SHORT_PREAMBLE BIT(7)
@@ -6682,7 +6682,7 @@
  #ifdef CONFIG_MAC80211_DEBUG_COUNTERS
  	unsigned int wme_rx_queue[NUM_RX_DATA_QUEUES];
 --- linux-2.6.22.noarch/net/mac80211/sta_info.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/sta_info.c	2007-07-20 16:29:45.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/sta_info.c	2007-07-23 08:36:33.000000000 -0400
 @@ -33,7 +33,7 @@ static void sta_info_hash_add(struct iee
  
  /* Caller must hold local->sta_lock */
@@ -6752,8 +6752,8 @@
  	list_del(&sta->list);
  	sdata = IEEE80211_DEV_TO_SUB_IF(sta->dev);
  	if (sta->flags & WLAN_STA_PS) {
---- linux-2.6.22.noarch/net/mac80211/debugfs_netdev.c.orig	2007-07-20 16:28:51.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/debugfs_netdev.c	2007-07-20 16:29:45.000000000 -0400
+--- linux-2.6.22.noarch/net/mac80211/debugfs_netdev.c.orig	2007-07-23 08:31:47.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/debugfs_netdev.c	2007-07-23 08:36:33.000000000 -0400
 @@ -87,6 +87,267 @@ static const struct file_operations name
  		IEEE80211_IF_FMT_##format(name, field)			\
  		__IEEE80211_IF_FILE(name)
@@ -7133,7 +7133,7 @@
  
  static void del_ap_files(struct ieee80211_sub_if_data *sdata)
 --- linux-2.6.22.noarch/net/mac80211/wpa.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/wpa.c	2007-07-20 16:29:45.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/wpa.c	2007-07-23 08:36:33.000000000 -0400
 @@ -20,6 +20,10 @@
  #include "tkip.h"
  #include "aes_ccm.h"
@@ -7432,8 +7432,8 @@
  		for (i = 0; i < tx->u.tx.num_extra_frag; i++) {
  			if (ccmp_encrypt_skb(tx, tx->u.tx.extra_frag[i], test)
  			    < 0)
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/net/wireless/nl80211.h	2007-07-20 16:29:45.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/net/wireless/nl80211.h	2007-07-23 08:36:33.000000000 -0400
 @@ -0,0 +1,24 @@
 +#ifndef __NET_WIRELESS_NL80211_H
 +#define __NET_WIRELESS_NL80211_H
@@ -7459,8 +7459,8 @@
 +#endif /* CONFIG_NL80211 */
 +
 +#endif /* __NET_WIRELESS_NL80211_H */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/net/wireless/nl80211.c	2007-07-20 16:29:45.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/net/wireless/nl80211.c	2007-07-23 08:36:33.000000000 -0400
 @@ -0,0 +1,1004 @@
 +/*
 + * This is the new netlink-based wireless configuration interface.
@@ -8466,15 +8466,15 @@
 +{
 +	genl_unregister_family(&nl80211_fam);
 +}
---- linux-2.6.22.noarch/net/wireless/Makefile.orig	2007-07-20 16:28:51.000000000 -0400
-+++ linux-2.6.22.noarch/net/wireless/Makefile	2007-07-20 16:29:45.000000000 -0400
+--- linux-2.6.22.noarch/net/wireless/Makefile.orig	2007-07-23 08:31:48.000000000 -0400
++++ linux-2.6.22.noarch/net/wireless/Makefile	2007-07-23 08:36:33.000000000 -0400
 @@ -2,3 +2,4 @@ obj-$(CONFIG_WIRELESS_EXT) += wext.o
  obj-$(CONFIG_CFG80211) += cfg80211.o
  
  cfg80211-y += core.o sysfs.o radiotap.o
 +cfg80211-$(CONFIG_NL80211) += nl80211.o
 --- linux-2.6.22.noarch/net/wireless/core.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/wireless/core.h	2007-07-20 16:29:45.000000000 -0400
++++ linux-2.6.22.noarch/net/wireless/core.h	2007-07-23 08:36:33.000000000 -0400
 @@ -43,7 +43,39 @@ struct cfg80211_registered_device *wiphy
  extern struct mutex cfg80211_drv_mutex;
  extern struct list_head cfg80211_drv_list;
@@ -8516,7 +8516,7 @@
 +
  #endif /* __NET_WIRELESS_CORE_H */
 --- linux-2.6.22.noarch/net/wireless/core.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/wireless/core.c	2007-07-20 16:29:45.000000000 -0400
++++ linux-2.6.22.noarch/net/wireless/core.c	2007-07-23 08:36:33.000000000 -0400
 @@ -16,6 +16,7 @@
  #include <net/genetlink.h>
  #include <net/cfg80211.h>
@@ -8698,7 +8698,7 @@
  	wiphy_sysfs_exit();
  }
 --- linux-2.6.22.noarch/net/wireless/Kconfig.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/wireless/Kconfig	2007-07-20 16:29:45.000000000 -0400
++++ linux-2.6.22.noarch/net/wireless/Kconfig	2007-07-23 08:36:33.000000000 -0400
 @@ -1,6 +1,19 @@
  config CFG80211
          tristate "Improved wireless configuration API"
@@ -8731,7 +8731,7 @@
  	  Say N (if you can) unless you know you need wireless
  	  extensions for external modules.
 --- linux-2.6.22.noarch/net/wireless/sysfs.c.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/net/wireless/sysfs.c	2007-07-20 16:29:45.000000000 -0400
++++ linux-2.6.22.noarch/net/wireless/sysfs.c	2007-07-23 08:36:33.000000000 -0400
 @@ -39,9 +39,61 @@ static ssize_t _show_permaddr(struct dev
  		       addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
  }
@@ -8795,7 +8795,7 @@
  };
  
 --- linux-2.6.22.noarch/.mailmap.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/.mailmap	2007-07-20 16:29:44.000000000 -0400
++++ linux-2.6.22.noarch/.mailmap	2007-07-23 08:36:33.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>
@@ -8804,8 +8804,8 @@
  John Stultz <johnstul at us.ibm.com>
  Juha Yrjola <at solidboot.com>
  Juha Yrjola <juha.yrjola at nokia.com>
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/usb/host/ohci-ssb.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/usb/host/ohci-ssb.c	2007-07-23 08:36:33.000000000 -0400
 @@ -0,0 +1,254 @@
 +/*
 + * Sonics Silicon Backplane
@@ -9061,8 +9061,8 @@
 +	.suspend	= ssb_ohci_suspend,
 +	.resume		= ssb_ohci_resume,
 +};
---- linux-2.6.22.noarch/drivers/usb/host/Kconfig.orig	2007-07-20 16:28:50.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/usb/host/Kconfig	2007-07-20 16:29:44.000000000 -0400
+--- linux-2.6.22.noarch/drivers/usb/host/Kconfig.orig	2007-07-23 08:31:39.000000000 -0400
++++ linux-2.6.22.noarch/drivers/usb/host/Kconfig	2007-07-23 08:36:33.000000000 -0400
 @@ -154,6 +154,19 @@ config USB_OHCI_HCD_PCI
  	  Enables support for PCI-bus plug-in USB controller cards.
  	  If unsure, say Y.
@@ -9083,8 +9083,8 @@
  config USB_OHCI_BIG_ENDIAN_DESC
  	bool
  	depends on USB_OHCI_HCD
---- linux-2.6.22.noarch/drivers/usb/host/ohci-hcd.c.orig	2007-07-20 16:28:50.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/usb/host/ohci-hcd.c	2007-07-20 16:29:44.000000000 -0400
+--- linux-2.6.22.noarch/drivers/usb/host/ohci-hcd.c.orig	2007-07-23 08:31:39.000000000 -0400
++++ linux-2.6.22.noarch/drivers/usb/host/ohci-hcd.c	2007-07-23 08:36:33.000000000 -0400
 @@ -926,11 +926,17 @@ MODULE_LICENSE ("GPL");
  #define PS3_SYSTEM_BUS_DRIVER	ps3_ohci_driver
  #endif
@@ -9135,16 +9135,16 @@
  #ifdef PCI_DRIVER
  	pci_unregister_driver(&PCI_DRIVER);
  #endif
---- linux-2.6.22.noarch/drivers/Makefile.orig	2007-07-20 16:28:49.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/Makefile	2007-07-20 16:30:03.000000000 -0400
-@@ -86,3 +86,4 @@ obj-$(CONFIG_GENERIC_TIME)	+= clocksourc
- obj-$(CONFIG_DMA_ENGINE)	+= dma/
+--- linux-2.6.22.noarch/drivers/Makefile.orig	2007-07-23 08:31:33.000000000 -0400
++++ linux-2.6.22.noarch/drivers/Makefile	2007-07-23 08:37:10.000000000 -0400
+@@ -87,3 +87,4 @@ obj-$(CONFIG_DMA_ENGINE)	+= dma/
  obj-$(CONFIG_HID)		+= hid/
  obj-$(CONFIG_PPC_PS3)		+= ps3/
+ obj-$(CONFIG_OF)		+= of/
 +obj-$(CONFIG_SSB)		+= ssb/
---- linux-2.6.22.noarch/drivers/Kconfig.orig	2007-07-20 16:28:49.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/Kconfig	2007-07-20 16:29:44.000000000 -0400
-@@ -56,6 +56,8 @@ source "drivers/power/Kconfig"
+--- linux-2.6.22.noarch/drivers/Kconfig.orig	2007-07-23 08:31:33.000000000 -0400
++++ linux-2.6.22.noarch/drivers/Kconfig	2007-07-23 08:36:33.000000000 -0400
+@@ -58,6 +58,8 @@ source "drivers/power/Kconfig"
  
  source "drivers/hwmon/Kconfig"
  
@@ -9153,8 +9153,8 @@
  source "drivers/mfd/Kconfig"
  
  source "drivers/media/Kconfig"
---- linux-2.6.22.noarch/drivers/net/b44.h.orig	2007-07-20 16:28:49.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/b44.h	2007-07-20 16:29:44.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/b44.h.orig	2007-07-23 08:31:37.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/b44.h	2007-07-23 08:36:33.000000000 -0400
 @@ -129,6 +129,7 @@
  #define  RXCONFIG_FLOW		0x00000020 /* Flow Control Enable */
  #define  RXCONFIG_FLOW_ACCEPT	0x00000040 /* Accept Unicast Flow Control Frame */
@@ -9281,8 +9281,8 @@
  
  	struct mii_if_info	mii_if;
  };
---- linux-2.6.22.noarch/drivers/net/b44.c.orig	2007-07-20 16:28:49.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/b44.c	2007-07-20 16:29:44.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/b44.c.orig	2007-07-23 08:31:37.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/b44.c	2007-07-23 08:36:33.000000000 -0400
 @@ -1,8 +1,11 @@
 -/* b44.c: Broadcom 4400 device driver.
 +/* b44.c: Broadcom 44xx/47xx Fast Ethernet device driver.
@@ -10587,8 +10587,8 @@
  }
  
  module_init(b44_init);
---- linux-2.6.22.noarch/drivers/net/Kconfig.orig	2007-07-20 16:28:49.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/Kconfig	2007-07-20 16:29:44.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/Kconfig.orig	2007-07-23 08:31:37.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/Kconfig	2007-07-23 08:36:33.000000000 -0400
 @@ -1452,18 +1452,36 @@ config APRICOT
  	  called apricot.
  
@@ -10631,7 +10631,7 @@
  	tristate "nForce Ethernet support"
  	depends on NET_PCI && PCI
 --- linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/Kconfig.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/Kconfig	2007-07-20 16:29:44.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/zd1211rw/Kconfig	2007-07-23 08:36:33.000000000 -0400
 @@ -1,6 +1,7 @@
  config ZD1211RW
  	tristate "ZyDAS ZD1211/ZD1211B USB-wireless support"
@@ -10640,8 +10640,8 @@
  	select WIRELESS_EXT
  	select FW_LOADER
  	---help---
---- linux-2.6.22.noarch/drivers/net/wireless/Makefile.orig	2007-07-20 16:28:50.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/Makefile	2007-07-20 16:29:44.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/Makefile.orig	2007-07-23 08:31:37.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/Makefile	2007-07-23 08:36:34.000000000 -0400
 @@ -47,3 +47,6 @@ obj-$(CONFIG_LIBERTAS_USB)     += libert
  
  rtl8187-objs		:= rtl8187_dev.o rtl8187_rtl8225.o
@@ -10649,8 +10649,8 @@
 +
 +# Drivers using Devicescape IEEE 802.11 stack (net/mac80211)
 +obj-y				+= mac80211/
---- linux-2.6.22.noarch/drivers/net/wireless/rtl8187_dev.c.orig	2007-07-20 16:28:50.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/rtl8187_dev.c	2007-07-20 16:29:44.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/rtl8187_dev.c.orig	2007-07-23 08:31:38.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/rtl8187_dev.c	2007-07-23 08:36:34.000000000 -0400
 @@ -96,7 +96,7 @@ static int rtl8187_tx(struct ieee80211_h
  	if (control->flags & IEEE80211_TXCTL_USE_RTS_CTS) {
  		tmp |= RTL8187_TX_FLAG_RTS;
@@ -10669,8 +10669,8 @@
  	for (i = 0; i < ETH_ALEN; i++)
  		rtl818x_iowrite8(priv, &priv->map->BSSID[i], conf->bssid[i]);
  
---- linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h.orig	2007-07-20 16:28:50.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h	2007-07-20 16:29:44.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h.orig	2007-07-23 08:31:38.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h	2007-07-23 08:36:34.000000000 -0400
 @@ -67,6 +67,7 @@ struct rtl8187_priv {
  	struct rtl818x_csr *map;
  	void (*rf_init)(struct ieee80211_hw *);
@@ -10679,8 +10679,8 @@
  
  	/* rtl8187 specific */
  	struct ieee80211_channel channels[14];
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/prism54pci.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/prism54pci.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,688 @@
 +
 +/*
@@ -11370,15 +11370,15 @@
 +
 +module_init(p54p_init);
 +module_exit(p54p_exit);
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/Makefile	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/Makefile	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,4 @@
 +obj-$(CONFIG_P54_COMMON)	+= prism54common.o
 +obj-$(CONFIG_P54_USB)		+= prism54usb.o
 +obj-$(CONFIG_P54_PCI)		+= prism54pci.o
 +
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/prism54pci.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/prism54pci.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,106 @@
 +#ifndef PRISM54PCI_H
 +#define PRISM54PCI_H
@@ -11486,8 +11486,8 @@
 +
 +#endif /* PRISM54USB_H */
 +#endif /* PRISM54PCI_H */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/prism54usb.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/prism54usb.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,903 @@
 +
 +/*
@@ -12392,8 +12392,8 @@
 +
 +module_init(p54u_init);
 +module_exit(p54u_exit);
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/prism54.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/prism54.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,79 @@
 +#ifndef PRISM54_H
 +#define PRISM54_H
@@ -12474,8 +12474,8 @@
 +void p54_free_common(struct ieee80211_hw *dev);
 +
 +#endif /* PRISM54_H */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/net2280.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/net2280.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,452 @@
 +#ifndef NET2280_H
 +#define NET2280_H
@@ -12929,8 +12929,8 @@
 +	__le32 addr;
 +} __attribute__ ((packed));
 +#endif /* NET2280_H */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/Kconfig	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/Kconfig	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,10 @@
 +config P54_COMMON
 +	tristate "Softmac Prism54 support"
@@ -12942,8 +12942,8 @@
 +config P54_PCI
 +	tristate "Prism54 PCI support"
 +	depends on P54_COMMON && PCI
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/prism54common.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/prism54common.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,953 @@
 +
 +/*
@@ -13898,8 +13898,8 @@
 +
 +module_init(p54_init);
 +module_exit(p54_exit);
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/prism54common.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/prism54common.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,329 @@
 +#ifndef PRISM54COMMON_H
 +#define PRISM54COMMON_H
@@ -14230,8 +14230,8 @@
 +};
 +
 +#endif /* PRISM54COMMON_H */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/prism54usb.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/p54/prism54usb.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,133 @@
 +#ifndef PRISM54USB_H
 +#define PRISM54USB_H
@@ -14366,8 +14366,8 @@
 +};
 +
 +#endif /* PRISM54USB_H */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_chip.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_chip.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,1618 @@
 +/* zd_chip.c
 + *
@@ -15987,8 +15987,8 @@
 +		ioreqs[0].value, ioreqs[1].value);
 +	return zd_iowrite32a(chip, ioreqs, ARRAY_SIZE(ioreqs));
 +}
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/Makefile	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/Makefile	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,11 @@
 +obj-$(CONFIG_ZD1211RW_MAC80211) += zd1211rw-mac80211.o
 +
@@ -16001,8 +16001,8 @@
 +EXTRA_CFLAGS += -DDEBUG
 +endif
 +
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_def.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_def.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,57 @@
 +/* zd_def.h
 + *
@@ -16061,8 +16061,8 @@
 +#endif
 +
 +#endif /* _ZD_DEF_H */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,108 @@
 +/* zd_rf.h
 + *
@@ -16172,8 +16172,8 @@
 +int zd_rf_init_uw2453(struct zd_rf *rf);
 +
 +#endif /* _ZD_RF_H */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_chip.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_chip.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,915 @@
 +/* zd_chip.h
 + *
@@ -17090,8 +17090,8 @@
 +	                       struct zd_mc_hash *hash);
 +
 +#endif /* _ZD_CHIP_H */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf_al2230.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf_al2230.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,439 @@
 +/* zd_rf_al2230.c: Functions for the AL2230 RF controller
 + *
@@ -17532,8 +17532,8 @@
 +	rf->patch_cck_gain = 1;
 +	return 0;
 +}
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_util.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_util.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,29 @@
 +/* zd_util.h
 + *
@@ -17564,8 +17564,8 @@
 +#endif /* DEBUG */
 +
 +#endif /* _ZD_UTIL_H */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_util.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_util.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,82 @@
 +/* zd_util.c
 + *
@@ -17649,8 +17649,8 @@
 +		return NULL;
 +	return (u8 *)buffer + (buffer_size - tail_size);
 +}
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf_rf2959.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf_rf2959.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,279 @@
 +/* zd_rf_rfmd.c: Functions for the RFMD RF controller
 + *
@@ -17931,8 +17931,8 @@
 +	rf->switch_radio_off = rf2959_switch_radio_off;
 +	return 0;
 +}
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_ieee80211.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_ieee80211.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,63 @@
 +#ifndef _ZD_IEEE80211_H
 +#define _ZD_IEEE80211_H
@@ -17997,8 +17997,8 @@
 +#define ZD_CCK_SIGNAL_11M	0x6e
 +
 +#endif /* _ZD_IEEE80211_H */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/Kconfig	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/Kconfig	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,19 @@
 +config ZD1211RW_MAC80211
 +	tristate "ZyDAS ZD1211/ZD1211B USB support (mac80211 stack)"
@@ -18019,8 +18019,8 @@
 +	  messages being saved to your kernel logs, which may help debug any
 +	  problems.
 +
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_ieee80211.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_ieee80211.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,100 @@
 +/* zd_ieee80211.c
 + *
@@ -18122,8 +18122,8 @@
 +	unmask_bg_channels(dev, range, &mac->modes[1]);
 +}
 +
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_usb.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_usb.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,270 @@
 +/* zd_usb.h: Header for USB interface implemented by ZD1211 chip
 + *
@@ -18395,8 +18395,8 @@
 +extern struct workqueue_struct *zd_workqueue;
 +
 +#endif /* _ZD_USB_H */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,178 @@
 +/* zd_rf.c
 + *
@@ -18576,8 +18576,8 @@
 +	return zd_chip_generic_patch_6m_band(zd_rf_to_chip(rf), channel);
 +}
 +
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf_uw2453.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf_uw2453.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,534 @@
 +/* zd_rf_uw2453.c: Functions for the UW2453 RF controller
 + *
@@ -19113,8 +19113,8 @@
 +	return 0;
 +}
 +
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,200 @@
 +/* zd_mac.h
 + *
@@ -19316,8 +19316,8 @@
 +#endif /* DEBUG */
 +
 +#endif /* _ZD_MAC_H */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf_al7230b.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf_al7230b.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,492 @@
 +/* zd_rf_al7230b.c: Functions for the AL7230B RF controller
 + *
@@ -19811,8 +19811,8 @@
 +
 +	return 0;
 +}
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_usb.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_usb.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,1489 @@
 +/* zd_usb.c
 + *
@@ -21303,8 +21303,8 @@
 +	kfree(req);
 +	return r;
 +}
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,957 @@
 +/* zd_mac.c
 + *
@@ -22263,8 +22263,8 @@
 +		&mac->housekeeping.link_led_work);
 +	zd_chip_control_leds(&mac->chip, LED_OFF);
 +}
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/Makefile	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/Makefile	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,6 @@
 +obj-$(CONFIG_BCM43XX_MAC80211)	+= bcm43xx/
 +obj-$(CONFIG_RT2X00)		+= rt2x00/
@@ -22272,8 +22272,8 @@
 +obj-$(CONFIG_P54_COMMON)	+= p54/
 +obj-$(CONFIG_ZD1211RW_MAC80211)	+= zd1211rw/
 +obj-$(CONFIG_IWLWIFI)	+= iwlwifi/
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/Kconfig	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/Kconfig	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,6 @@
 +source "drivers/net/wireless/mac80211/bcm43xx/Kconfig"
 +source "drivers/net/wireless/mac80211/rt2x00/Kconfig"
@@ -22281,8 +22281,8 @@
 +source "drivers/net/wireless/mac80211/p54/Kconfig"
 +source "drivers/net/wireless/mac80211/zd1211rw/Kconfig"
 +source "drivers/net/wireless/mac80211/iwlwifi/Kconfig"
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/adm8211/adm8211.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/adm8211/adm8211.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,620 @@
 +#ifndef ADM8211_H
 +#define ADM8211_H
@@ -22904,12 +22904,12 @@
 +};
 +
 +#endif /* ADM8211_H */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/adm8211/Makefile	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/adm8211/Makefile	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1 @@
 +obj-$(CONFIG_ADM8211)	+= adm8211.o
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/adm8211/Kconfig	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/adm8211/Kconfig	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,25 @@
 +config ADM8211
 +	tristate "ADMtek ADM8211 support"
@@ -22936,8 +22936,8 @@
 +	  the Ralink RT2400 (SMC2635W) without a model number change.
 +
 +	  Thanks to Infineon-ADMtek for their support of this driver.
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/adm8211/adm8211.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/adm8211/adm8211.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,2165 @@
 +
 +/*
@@ -25104,8 +25104,8 @@
 +
 +module_init(adm8211_init);
 +module_exit(adm8211_exit);
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,28 @@
 +#ifndef BCM43xx_TABLES_H_
 +#define BCM43xx_TABLES_H_
@@ -25135,8 +25135,8 @@
 +extern const u16 bcm43xx_tab_sigmasqr2[];
 +
 +#endif /* BCM43xx_TABLES_H_ */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/Makefile	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/Makefile	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,18 @@
 +obj-$(CONFIG_BCM43XX_MAC80211) += bcm43xx-mac80211.o
 +
@@ -25156,8 +25156,8 @@
 +		         bcm43xx_xmit.o \
 +		         bcm43xx_lo.o \
 +		         $(bcm43xx-mac80211-obj-y)
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,1508 @@
 +/*
 +
@@ -26667,8 +26667,8 @@
 +	bcm43xx_dma_tx_resume_ring(dev->dma.tx_ring0);
 +	bcm43xx_power_saving_ctl_bits(dev, -1, -1);
 +}
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,9 @@
 +#ifndef BCM43xx_SYSFS_H_
 +#define BCM43xx_SYSFS_H_
@@ -26679,8 +26679,8 @@
 +void bcm43xx_sysfs_unregister(struct bcm43xx_wldev *dev);
 +
 +#endif /* BCM43xx_SYSFS_H_ */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,310 @@
 +#ifndef BCM43xx_PHY_H_
 +#define BCM43xx_PHY_H_
@@ -26992,8 +26992,8 @@
 +			   u8 tx_control);
 +
 +#endif /* BCM43xx_PHY_H_ */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,88 @@
 +#ifndef BCM43xx_LO_H_
 +#define BCM43xx_LO_H_
@@ -27083,8 +27083,8 @@
 +					 const struct bcm43xx_bbatt *bbatt);
 +
 +#endif /* BCM43xx_LO_H_ */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,652 @@
 +/*
 +
@@ -27738,8 +27738,8 @@
 +
 +	/*TODO: We might need some stack support here to get the values. */
 +}
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,22 @@
 +#ifndef BCM43xx_PCMCIA_H_
 +#define BCM43xx_PCMCIA_H_
@@ -27763,8 +27763,8 @@
 +
 +#endif /* CONFIG_BCM43XX_MAC80211_PCMCIA */
 +#endif /* BCM43xx_PCMCIA_H_ */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,4028 @@
 +/*
 +
@@ -31794,8 +31794,8 @@
 +
 +module_init(bcm43xx_init)
 +module_exit(bcm43xx_exit)
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,158 @@
 +/*
 +
@@ -31955,8 +31955,8 @@
 +{
 +	pcmcia_unregister_driver(&bcm43xx_pcmcia_driver);
 +}
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,4365 @@
 +/*
 +
@@ -36323,8 +36323,8 @@
 +	phy->radio_on = 0;
 +	dprintk(KERN_INFO PFX "Radio turned off\n");
 +}
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,82 @@
 +/*
 +
@@ -36408,8 +36408,8 @@
 +		}
 +	}
 +}
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,613 @@
 +/*
 +
@@ -37024,8 +37024,8 @@
 +	}
 +	printk("\n");
 +}
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,376 @@
 +/*
 +
@@ -37403,8 +37403,8 @@
 +	bcm43xx_phy_write(dev, BCM43xx_PHY_GTABCTL, table + offset);
 +	bcm43xx_phy_write(dev, BCM43xx_PHY_GTABDATA, value);
 +}
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,232 @@
 +/*
 +
@@ -37638,8 +37638,8 @@
 +	device_remove_file(dev, &dev_attr_shortpreamble);
 +	device_remove_file(dev, &dev_attr_interference);
 +}
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,300 @@
 +/*
 +
@@ -37941,8 +37941,8 @@
 +	bcm43xx_write16(dev, BCM43xx_MMIO_GPIO_CONTROL, ledctl);
 +	spin_unlock_irqrestore(&dev->wl->leds_lock, flags);
 +}
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,365 @@
 +#ifndef BCM43xx_DMA_H_
 +#define BCM43xx_DMA_H_
@@ -38309,8 +38309,8 @@
 +
 +#endif /* CONFIG_BCM43XX_MAC80211_DMA */
 +#endif /* BCM43xx_DMA_H_ */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/Kconfig	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/Kconfig	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,101 @@
 +config BCM43XX_MAC80211
 +	tristate "Broadcom BCM43xx wireless support (mac80211 stack)"
@@ -38413,8 +38413,8 @@
 +	  Only use PIO, if DMA does not work for you.
 +
 +endchoice
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,267 @@
 +#ifndef BCM43xx_XMIT_H_
 +#define BCM43xx_XMIT_H_
@@ -38683,8 +38683,8 @@
 +}
 +
 +#endif /* BCM43xx_XMIT_H_ */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,41 @@
 +/*
 +
@@ -38727,8 +38727,8 @@
 +				   int bit25, int bit26);
 +
 +#endif /* BCM43xx_POWER_H_ */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,170 @@
 +#ifndef BCM43xx_PIO_H_
 +#define BCM43xx_PIO_H_
@@ -38900,8 +38900,8 @@
 +
 +#endif /* CONFIG_BCM43XX_MAC80211_PIO */
 +#endif /* BCM43xx_PIO_H_ */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,56 @@
 +#ifndef BCM43xx_LEDS_H_
 +#define BCM43xx_LEDS_H_
@@ -38959,8 +38959,8 @@
 +void bcm43xx_leds_switch_all(struct bcm43xx_wldev *dev, int on);
 +
 +#endif /* BCM43xx_LEDS_H_ */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,156 @@
 +/*
 +
@@ -39118,8 +39118,8 @@
 +void bcm43xx_controller_restart(struct bcm43xx_wldev *dev, const char *reason);
 +
 +#endif /* BCM43xx_MAIN_H_ */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,1112 @@
 +/*
 +
@@ -40233,8 +40233,8 @@
 +{
 +	bcm43xx_lo_g_ctl_current(dev)->used = 1;
 +}
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,886 @@
 +#ifndef BCM43xx_H_
 +#define BCM43xx_H_
@@ -41122,8 +41122,8 @@
 +#define Q52_ARG(q52)	((q52) / 4), ((((q52) & 3) * 100) / 4)
 +
 +#endif /* BCM43xx_H_ */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,671 @@
 +/*
 +
@@ -41796,8 +41796,8 @@
 +	if (!list_empty(&pio->queue3->txqueue))
 +		tasklet_schedule(&pio->queue3->txtask);
 +}
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,133 @@
 +#ifndef BCM43xx_DEBUGFS_H_
 +#define BCM43xx_DEBUGFS_H_
@@ -41932,8 +41932,8 @@
 +	} while (0)
 +
 +#endif /* BCM43xx_DEBUGFS_H_ */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-channel.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-channel.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,161 @@
 +/******************************************************************************
 + *
@@ -42096,8 +42096,8 @@
 +	const struct iwl_priv *priv, int phymode, int channel);
 +
 +#endif
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/Makefile	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/Makefile	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,29 @@
 +# NOTE:  We use common code from base.c to build driver
 +# specific binaries based on the #define IWL -- the target
@@ -42128,8 +42128,8 @@
 +	$(call cmd,force_checksrc)
 +	$(call if_changed_rule,cc_o_c)
 +
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-eeprom.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-eeprom.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,335 @@
 +/******************************************************************************
 + *
@@ -42466,8 +42466,8 @@
 +#define IWL_EEPROM_IMAGE_SIZE 1024
 +
 +#endif
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-4965-rs.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-4965-rs.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,2013 @@
 +/******************************************************************************
 + *
@@ -44482,8 +44482,8 @@
 +	ieee80211_rate_control_unregister(&rs_ops);
 +}
 +
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-commands.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-commands.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,701 @@
 +/******************************************************************************
 + *
@@ -45186,8 +45186,8 @@
 +} __attribute__ ((packed));
 +
 +#endif				/* __iwl_commands_h__ */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945-rs.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945-rs.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,221 @@
 +/******************************************************************************
 + *
@@ -45410,8 +45410,8 @@
 +#endif /* IWL == 3945 */
 +
 +#endif
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,2445 @@
 +/******************************************************************************
 + *
@@ -47858,8 +47858,8 @@
 +};
 +
 +MODULE_DEVICE_TABLE(pci, iwl_hw_card_ids);
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-4965.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-4965.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,4379 @@
 +/******************************************************************************
 + *
@@ -52240,8 +52240,8 @@
 +};
 +
 +MODULE_DEVICE_TABLE(pci, iwl_hw_card_ids);
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-4965-rs.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-4965-rs.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,285 @@
 +/******************************************************************************
 + *
@@ -52528,8 +52528,8 @@
 +#endif /* IWL == 4965 */
 +
 +#endif
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/Kconfig	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/Kconfig	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,96 @@
 +config IWLWIFI
 +	bool "Intel Wireless WiFi Link Drivers"
@@ -52627,8 +52627,8 @@
 +	  inserted in and remvoed from the running kernel whenever you want),
 +	  say M here and read <file:Documentation/modules.txt>.  The module
 +	  will be called iwl3945.ko.
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,8375 @@
 +/******************************************************************************
 + *
@@ -61005,8 +61005,8 @@
 +
 +module_exit(iwl_exit);
 +module_init(iwl_init);
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-io.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-io.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,474 @@
 +/******************************************************************************
 + *
@@ -61482,8 +61482,8 @@
 +}
 +
 +#endif
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-4965-hw.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-4965-hw.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,979 @@
 +/******************************************************************************
 + *
@@ -62464,8 +62464,8 @@
 +} __attribute__ ((packed));
 +
 +#endif /* __iwl_4965_hw_h__ */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-hw.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-hw.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,1507 @@
 +/******************************************************************************
 + *
@@ -63974,8 +63974,8 @@
 +#endif
 +
 +#endif				/* __iwlwifi_hw_h__ */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-spectrum.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-spectrum.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,91 @@
 +/******************************************************************************
 + *
@@ -64068,8 +64068,8 @@
 +	} u;
 +} __attribute__ ((packed));
 +#endif
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-priv.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-priv.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,303 @@
 +/******************************************************************************
 + *
@@ -64374,8 +64374,8 @@
 +};				/*iwl_priv */
 +
 +#endif /* __iwl_priv_h__ */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-4965.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-4965.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,247 @@
 +/******************************************************************************
 + *
@@ -64624,8 +64624,8 @@
 +
 +#endif				/* IWL == 4965 */
 +#endif				/* __iwl_4965_h__ */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,658 @@
 +/******************************************************************************
 + *
@@ -65285,8 +65285,8 @@
 +
 +
 +#endif
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,52 @@
 +/******************************************************************************
 + *
@@ -65340,8 +65340,8 @@
 +#endif				/* IWL == 3945 */
 +
 +#endif
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-debug.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-debug.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,140 @@
 +/******************************************************************************
 + *
@@ -65483,8 +65483,8 @@
 +#define IWL_DEBUG_11H(f, a...)  IWL_DEBUG(IWL_DL_11H, f, ## a)
 +
 +#endif
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945-hw.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945-hw.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,90 @@
 +/******************************************************************************
 + *
@@ -65576,8 +65576,8 @@
 +} __attribute__ ((packed));
 +
 +#endif
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-helpers.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-helpers.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,363 @@
 +/******************************************************************************
 + *
@@ -65942,8 +65942,8 @@
 +#endif
 +
 +#endif				/* __iwl_helpers_h__ */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945-rs.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945-rs.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,969 @@
 +/******************************************************************************
 + *
@@ -66914,8 +66914,8 @@
 +}
 +
 +
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,1116 @@
 +/*
 +	Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -68033,8 +68033,8 @@
 +}
 +
 +#endif /* RT2X00_H */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00usb.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00usb.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,593 @@
 +/*
 +	Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -68629,8 +68629,8 @@
 +MODULE_VERSION(DRV_VERSION);
 +MODULE_DESCRIPTION("rt2x00 library");
 +MODULE_LICENSE("GPL");
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,966 @@
 +/*
 +	Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -69598,8 +69598,8 @@
 +})
 +
 +#endif /* RT73USB_H */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,1000 @@
 +/*
 +	Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -70601,8 +70601,8 @@
 +MODULE_VERSION(DRV_VERSION);
 +MODULE_DESCRIPTION("rt2x00 library");
 +MODULE_LICENSE("GPL");
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,1694 @@
 +/*
 +	Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -72298,8 +72298,8 @@
 +
 +module_init(rt2400pci_init);
 +module_exit(rt2400pci_exit);
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00dev.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00dev.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,60 @@
 +/*
 +	Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -72361,8 +72361,8 @@
 +	const int antenna_tx, const int antenna_rx);
 +
 +#endif /* RT2X00DEV_H */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/Makefile	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/Makefile	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,22 @@
 +rt2x00lib-objs := rt2x00dev.o rt2x00mac.o
 +
@@ -72386,8 +72386,8 @@
 +obj-$(CONFIG_RT61PCI)		+= rt61pci.o
 +obj-$(CONFIG_RT2500USB)		+= rt2500usb.o
 +obj-$(CONFIG_RT73USB)		+= rt73usb.o
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,1613 @@
 +/*
 +	Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -74002,8 +74002,8 @@
 +
 +module_init(rt2500usb_init);
 +module_exit(rt2500usb_exit);
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00lib.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00lib.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,111 @@
 +/*
 +	Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -74116,8 +74116,8 @@
 +	const struct ieee80211_tx_queue_params *params);
 +
 +#endif /* RT2X00LIB_H */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00rfkill.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00rfkill.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,58 @@
 +/*
 +	Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -74177,8 +74177,8 @@
 +#endif /* CONFIG_RT2X00_LIB_RFKILL */
 +
 +#endif /* RT2X00RFKILL_H */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00usb.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00usb.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,132 @@
 +/*
 +	Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -74312,8 +74312,8 @@
 +#endif /* CONFIG_PM */
 +
 +#endif /* RT2X00USB_H */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00debug.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00debug.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,360 @@
 +/*
 +	Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -74675,8 +74675,8 @@
 +
 +	rt2x00dev->debugfs_intf = NULL;
 +}
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00mac.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00mac.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,408 @@
 +/*
 +	Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -75086,8 +75086,8 @@
 +	return 0;
 +}
 +EXPORT_SYMBOL_GPL(rt2x00lib_conf_tx);
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00debug.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00debug.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,66 @@
 +/*
 +	Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -75155,8 +75155,8 @@
 +#endif /* CONFIG_RT2X00_LIB_DEBUGFS */
 +
 +#endif /* RT2X00DEBUG_H */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,1381 @@
 +/*
 +	Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -76539,8 +76539,8 @@
 +})
 +
 +#endif /* RT61PCI_H */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,942 @@
 +/*
 +	Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -77484,8 +77484,8 @@
 +})
 +
 +#endif /* RT2400PCI_H */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,748 @@
 +/*
 +	Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -78235,8 +78235,8 @@
 +})
 +
 +#endif /* RT2500USB_H */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,1216 @@
 +/*
 +	Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -79454,8 +79454,8 @@
 +})
 +
 +#endif /* RT2500PCI_H */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00rfkill.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00rfkill.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,145 @@
 +/*
 +	Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -79602,8 +79602,8 @@
 +	input_free_polled_device(rt2x00dev->poll_dev);
 +	rfkill_free(rt2x00dev->rfkill);
 +}
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00firmware.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00firmware.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,43 @@
 +/*
 +	Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -79648,8 +79648,8 @@
 +#endif /* CONFIG_RT2X00_LIB_FIRMWARE */
 +
 +#endif /* RT2X00FIRMWARE_H */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/Kconfig	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/Kconfig	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,129 @@
 +config RT2X00
 +	tristate "Ralink driver support"
@@ -79780,8 +79780,8 @@
 +	depends on RT2X00_LIB
 +	---help---
 +	  Enable debugging output for all rt2x00 modules
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00firmware.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00firmware.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,104 @@
 +/*
 +	Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -79887,8 +79887,8 @@
 +
 +	return -ENOENT;
 +}
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,1915 @@
 +/*
 +	Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -81805,8 +81805,8 @@
 +
 +module_init(rt2500pci_init);
 +module_exit(rt2500pci_exit);
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,2419 @@
 +/*
 +	Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -84227,8 +84227,8 @@
 +
 +module_init(rt61pci_init);
 +module_exit(rt61pci_exit);
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00pci.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00pci.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,451 @@
 +/*
 +	Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -84681,8 +84681,8 @@
 +MODULE_VERSION(DRV_VERSION);
 +MODULE_DESCRIPTION("rt2x00 library");
 +MODULE_LICENSE("GPL");
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,118 @@
 +/*
 +	Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -84802,8 +84802,8 @@
 +#endif /* CONFIG_PM */
 +
 +#endif /* RT2X00PCI_H */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,1913 @@
 +/*
 +	Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
@@ -86718,13 +86718,13 @@
 +
 +module_init(rt73usb_init);
 +module_exit(rt73usb_exit);
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/README	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/README	2007-07-23 08:36:34.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.22.noarch/drivers/net/wireless/Kconfig.orig	2007-07-20 16:28:50.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig	2007-07-20 16:29:44.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig	2007-07-23 08:31:37.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig	2007-07-23 08:36:34.000000000 -0400
 @@ -562,4 +562,6 @@ source "drivers/net/wireless/hostap/Kcon
  source "drivers/net/wireless/bcm43xx/Kconfig"
  source "drivers/net/wireless/zd1211rw/Kconfig"
@@ -86733,7 +86733,7 @@
 +
  endmenu
 --- linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/Kconfig.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/Kconfig	2007-07-20 16:29:44.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/Kconfig	2007-07-23 08:36:34.000000000 -0400
 @@ -1,6 +1,7 @@
  config BCM43XX
  	tristate "Broadcom BCM43xx wireless support"
@@ -86742,8 +86742,8 @@
  	select WIRELESS_EXT
  	select FW_LOADER
  	select HW_RANDOM
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/Makefile	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/ssb/Makefile	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,11 @@
 +ssb-builtin-drivers-y					+= driver_chipcommon.o
 +ssb-builtin-drivers-$(CONFIG_SSB_DRIVER_MIPS)		+= driver_mipscore.o
@@ -86756,8 +86756,8 @@
 +
 +ssb-objs	:= main.o scan.o \
 +		   $(ssb-hostsupport-y) $(ssb-builtin-drivers-y)
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pcmcia.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pcmcia.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,263 @@
 +/*
 + * Sonics Silicon Backplane
@@ -87022,8 +87022,8 @@
 +error:
 +	return -ENODEV;
 +}
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/main.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/ssb/main.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,1061 @@
 +/*
 + * Sonics Silicon Backplane
@@ -88086,8 +88086,8 @@
 +	bus_unregister(&ssb_bustype);
 +}
 +module_exit(ssb_modexit)
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pcihost_wrapper.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pcihost_wrapper.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,104 @@
 +/*
 + * Sonics Silicon Backplane
@@ -88193,8 +88193,8 @@
 +	return pci_register_driver(driver);
 +}
 +EXPORT_SYMBOL(ssb_pcihost_register);
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_mipscore.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_mipscore.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,258 @@
 +/*
 + * Sonics Silicon Backplane
@@ -88454,8 +88454,8 @@
 +	ssb_mips_serial_init(mcore);
 +	ssb_mips_flash_detect(mcore);
 +}
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/ssb_private.h	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/ssb/ssb_private.h	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,137 @@
 +#ifndef LINUX_SSB_PRIVATE_H_
 +#define LINUX_SSB_PRIVATE_H_
@@ -88594,8 +88594,8 @@
 +#endif /* CONFIG_SSB_PCIHOST */
 +
 +#endif /* LINUX_SSB_PRIVATE_H_ */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pci.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pci.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,688 @@
 +/*
 + * Sonics Silicon Backplane PCI-Hostbus related functions.
@@ -89285,8 +89285,8 @@
 +out:
 +	return err;
 +}
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,402 @@
 +/*
 + * Sonics Silicon Backplane
@@ -89690,8 +89690,8 @@
 +	return nr_ports;
 +}
 +#endif /* CONFIG_SSB_SERIAL */
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/Kconfig	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/ssb/Kconfig	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,93 @@
 +menu "Sonics Silicon Backplane"
 +
@@ -89786,8 +89786,8 @@
 +	  If unsure, say N
 +
 +endmenu
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/scan.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/ssb/scan.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,407 @@
 +/*
 + * Sonics Silicon Backplane
@@ -90196,8 +90196,8 @@
 +	ssb_iounmap(bus);
 +	goto out;
 +}
---- /dev/null	2007-07-20 08:31:48.355055592 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c	2007-07-20 16:29:44.000000000 -0400
+--- /dev/null	2007-07-23 08:17:43.342601436 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c	2007-07-23 08:36:34.000000000 -0400
 @@ -0,0 +1,562 @@
 +/*
 + * Sonics Silicon Backplane


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- kernel.spec	22 Jul 2007 04:07:19 -0000	1.27
+++ kernel.spec	23 Jul 2007 12:54:42 -0000	1.28
@@ -1183,9 +1183,9 @@
 ApplyPatch linux-2.6-ata-quirk.patch
 
 # Add the wireless stack updates and drivers from wireless-dev
-#ApplyPatch git-wireless-dev.patch
+ApplyPatch git-wireless-dev.patch
 # Add iwlwifi from intellinuxwireless.org
-#ApplyPatch git-iwlwifi.patch
+ApplyPatch git-iwlwifi.patch
 # add patch from markmc so that e1000 supports ICH9
 ApplyPatch linux-2.6-e1000-ich9.patch
 # avoid bcm3xx vs bcm43xx-mac80211 PCI ID conflicts
@@ -2130,6 +2130,9 @@
 %endif
 
 %changelog
+* Mon Jul 23 2007 John W. Linville <linville at redhat.com>
+- Rediff git-wireless-dev.patch
+
 * Sat Jul 21 2007 Roland McGrath <roland at redhat.com>
 - Fix biarch issue in linux-2.6-elf-core-sysctl.patch
 




More information about the scm-commits mailing list