rpms/kernel/devel git-wireless-dev.patch, 1.23, 1.24 kernel.spec, 1.29, 1.30 git-iwlwifi.patch, 1.13, NONE

John W. Linville (linville) fedora-extras-commits at redhat.com
Thu Jul 26 02:18:47 UTC 2007


Author: linville

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

Modified Files:
	git-wireless-dev.patch kernel.spec 
Removed Files:
	git-iwlwifi.patch 
Log Message:
wireless updates

git-wireless-dev.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.23 -r 1.24 git-wireless-dev.patch
Index: git-wireless-dev.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/git-wireless-dev.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- git-wireless-dev.patch	23 Jul 2007 12:54:41 -0000	1.23
+++ git-wireless-dev.patch	26 Jul 2007 02:18:35 -0000	1.24
@@ -1,5 +1,5 @@
---- 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
+--- linux-2.6.22.noarch/CREDITS.orig	2007-07-25 21:50:25.000000000 -0400
++++ linux-2.6.22.noarch/CREDITS	2007-07-25 21:54:04.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-23 08:36:33.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/nl80211.h	2007-07-25 21:54:05.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-23 08:31:46.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/ieee80211.h	2007-07-23 08:36:33.000000000 -0400
+--- linux-2.6.22.noarch/include/linux/ieee80211.h.orig	2007-07-25 21:50:31.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/ieee80211.h	2007-07-25 21:54:05.000000000 -0400
 @@ -106,6 +106,75 @@ struct ieee80211_hdr {
  } __attribute__ ((packed));
  
@@ -627,8 +627,8 @@
 +};
 +
  #endif /* IEEE80211_H */
---- /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
+--- /dev/null	2007-07-25 20:19:48.826786442 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h	2007-07-25 21:54:05.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-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
+--- /dev/null	2007-07-25 20:19:48.826786442 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h	2007-07-25 21:54:05.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-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
+--- /dev/null	2007-07-25 20:19:48.826786442 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h	2007-07-25 21:54:05.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-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
+--- /dev/null	2007-07-25 20:19:48.826786442 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h	2007-07-25 21:54:05.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-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
+--- /dev/null	2007-07-25 20:19:48.826786442 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h	2007-07-25 21:54:05.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-23 08:17:43.342601436 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb.h	2007-07-23 08:36:33.000000000 -0400
+--- /dev/null	2007-07-25 20:19:48.826786442 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb.h	2007-07-25 21:54:05.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-23 08:31:46.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/cfg80211.h	2007-07-23 08:36:33.000000000 -0400
+--- linux-2.6.22.noarch/include/net/cfg80211.h.orig	2007-07-25 21:50:31.000000000 -0400
++++ linux-2.6.22.noarch/include/net/cfg80211.h	2007-07-25 21:54:05.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-23 08:31:46.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/mac80211.h	2007-07-23 08:36:33.000000000 -0400
+--- linux-2.6.22.noarch/include/net/mac80211.h.orig	2007-07-25 21:50:31.000000000 -0400
++++ linux-2.6.22.noarch/include/net/mac80211.h	2007-07-25 21:54:05.000000000 -0400
 @@ -300,7 +300,6 @@ struct ieee80211_conf {
  	/* Following five fields are used for IEEE 802.11H */
  	unsigned int radar_detect;
@@ -2230,7 +2230,17 @@
  	u32 flags;			/* hardware flags defined above */
  
  	/* Set to the size of a needed device specific skb headroom for TX skbs. */
-@@ -649,8 +651,7 @@ struct ieee80211_ops {
+@@ -626,8 +628,7 @@ struct ieee80211_ops {
+ 	 * station hwaddr for individual keys. aid of the station is given
+ 	 * to help low-level driver in selecting which key->hw_key_idx to use
+ 	 * for this key. TX control data will use the hw_key_idx selected by
+-	 * the low-level driver.
+-	 * Must be atomic. */
++	 * the low-level driver. */
+ 	int (*set_key)(struct ieee80211_hw *hw, set_key_cmd cmd,
+ 		       u8 *addr, struct ieee80211_key_conf *key, int aid);
+ 
+@@ -649,8 +650,7 @@ struct ieee80211_ops {
  	 * used if the wlan hardware or low-level driver implements PAE.
  	 * 80211.o module will anyway filter frames based on authorization
  	 * state, so this function pointer can be NULL if low-level driver does
@@ -2240,7 +2250,7 @@
  	int (*set_port_auth)(struct ieee80211_hw *hw, u8 *addr,
  			     int authorized);
  
-@@ -692,6 +693,14 @@ struct ieee80211_ops {
+@@ -692,6 +692,14 @@ struct ieee80211_ops {
  	void (*sta_table_notification)(struct ieee80211_hw *hw,
  				       int num_sta);
  
@@ -2255,7 +2265,7 @@
  	/* Configure TX queue parameters (EDCF (aifs, cw_min, cw_max),
  	 * bursting) for a hardware TX queue.
  	 * queue = IEEE80211_TX_QUEUE_*.
-@@ -702,8 +711,9 @@ struct ieee80211_ops {
+@@ -702,8 +710,9 @@ struct ieee80211_ops {
  	/* Get statistics of the current TX queue status. This is used to get
  	 * number of currently queued packets (queue length), maximum queue
  	 * size (limit), and total number of packets sent using each TX queue
@@ -2267,7 +2277,7 @@
  	int (*get_tx_stats)(struct ieee80211_hw *hw,
  			    struct ieee80211_tx_queue_stats *stats);
  
-@@ -713,12 +723,25 @@ struct ieee80211_ops {
+@@ -713,12 +722,25 @@ struct ieee80211_ops {
  	 * Must be atomic. */
  	u64 (*get_tsf)(struct ieee80211_hw *hw);
  
@@ -2293,7 +2303,7 @@
  	/* Setup beacon data for IBSS beacons. Unlike access point (Master),
  	 * IBSS uses a fixed beacon frame which is configured using this
  	 * function. This handler is required only for IBSS mode. */
-@@ -830,6 +853,7 @@ struct sk_buff *ieee80211_beacon_get(str
+@@ -830,6 +852,7 @@ struct sk_buff *ieee80211_beacon_get(str
  /**
   * ieee80211_rts_get - RTS frame generation function
   * @hw: pointer obtained from ieee80211_alloc_hw().
@@ -2301,7 +2311,7 @@
   * @frame: pointer to the frame that is going to be protected by the RTS.
   * @frame_len: the frame length (in octets).
   * @frame_txctl: &struct ieee80211_tx_control of the frame.
-@@ -840,7 +864,7 @@ struct sk_buff *ieee80211_beacon_get(str
+@@ -840,7 +863,7 @@ struct sk_buff *ieee80211_beacon_get(str
   * the next RTS frame from the 802.11 code. The low-level is responsible
   * for calling this function before and RTS frame is needed.
   */
@@ -2310,7 +2320,7 @@
  		       const void *frame, size_t frame_len,
  		       const struct ieee80211_tx_control *frame_txctl,
  		       struct ieee80211_rts *rts);
-@@ -848,6 +872,7 @@ void ieee80211_rts_get(struct ieee80211_
+@@ -848,6 +871,7 @@ void ieee80211_rts_get(struct ieee80211_
  /**
   * ieee80211_rts_duration - Get the duration field for an RTS frame
   * @hw: pointer obtained from ieee80211_alloc_hw().
@@ -2318,7 +2328,7 @@
   * @frame_len: the length of the frame that is going to be protected by the RTS.
   * @frame_txctl: &struct ieee80211_tx_control of the frame.
[...142244 lines suppressed...]
-+	{ USB_DEVICE(0x0db0, 0xa874), USB_DEVICE_DATA(&rt73usb_ops) },
-+	/* Ralink */
-+	{ USB_DEVICE(0x148f, 0x2573), USB_DEVICE_DATA(&rt73usb_ops) },
-+	{ USB_DEVICE(0x148f, 0x2671), USB_DEVICE_DATA(&rt73usb_ops) },
-+	/* Qcom */
-+	{ USB_DEVICE(0x18e8, 0x6196), USB_DEVICE_DATA(&rt73usb_ops) },
-+	{ USB_DEVICE(0x18e8, 0x6229), USB_DEVICE_DATA(&rt73usb_ops) },
-+	/* Sitecom */
-+	{ USB_DEVICE(0x0df6, 0x9712), USB_DEVICE_DATA(&rt73usb_ops) },
-+	{ USB_DEVICE(0x0df6, 0x90ac), USB_DEVICE_DATA(&rt73usb_ops) },
-+	/* Surecom */
-+	{ USB_DEVICE(0x0769, 0x31f3), USB_DEVICE_DATA(&rt73usb_ops) },
-+	/* Planex */
-+	{ USB_DEVICE(0x2019, 0xab01), USB_DEVICE_DATA(&rt73usb_ops) },
-+	{ USB_DEVICE(0x2019, 0xab50), USB_DEVICE_DATA(&rt73usb_ops) },
-+	{ 0, }
-+};
++	IWL_DEBUG(IWL_DL_INFO | IWL_DL_RATE, "Network RSSI: %d\n", rssi);
 +
-+MODULE_AUTHOR(DRV_PROJECT);
-+MODULE_VERSION(DRV_VERSION);
-+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");
++	rs_priv->start_rate = iwl_get_rate_index_by_rssi(rssi, priv->phymode);
 +
-+static struct usb_driver rt73usb_driver = {
-+	.name		= DRV_NAME,
-+	.id_table	= rt73usb_device_table,
-+	.probe		= rt2x00usb_probe,
-+	.disconnect	= rt2x00usb_disconnect,
-+#ifdef CONFIG_PM
-+	.suspend	= rt2x00usb_suspend,
-+	.resume		= rt2x00usb_resume,
-+#endif /* CONFIG_PM */
-+};
++	IWL_DEBUG_RATE("leave: rssi %d assign rate index: "
++		       "%d (plcp 0x%x)\n", rssi, rs_priv->start_rate,
++		       iwl_rates[rs_priv->start_rate].plcp);
++}
 +
-+static int __init rt73usb_init(void)
++void iwl_rate_control_register(void)
 +{
-+	return usb_register(&rt73usb_driver);
++	ieee80211_rate_control_register(&rs_ops);
 +}
 +
-+static void __exit rt73usb_exit(void)
++void iwl_rate_control_unregister(void)
 +{
-+	usb_deregister(&rt73usb_driver);
++	ieee80211_rate_control_unregister(&rs_ops);
 +}
 +
-+module_init(rt73usb_init);
-+module_exit(rt73usb_exit);
---- /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-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"
- 
-+source "drivers/net/wireless/mac80211/Kconfig"
 +
- 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-23 08:36:34.000000000 -0400
-@@ -1,6 +1,7 @@
- config BCM43XX
- 	tristate "Broadcom BCM43xx wireless support"
- 	depends on PCI && IEEE80211 && IEEE80211_SOFTMAC && WLAN_80211 && EXPERIMENTAL
-+	depends on BCM43XX_MAC80211 != 'y'
- 	select WIRELESS_EXT
- 	select FW_LOADER
- 	select HW_RANDOM
---- /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
+--- /dev/null	2007-07-25 20:19:48.826786442 -0400
++++ linux-2.6.22.noarch/drivers/ssb/Makefile	2007-07-25 21:54:05.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 +88737,8 @@
 +
 +ssb-objs	:= main.o scan.o \
 +		   $(ssb-hostsupport-y) $(ssb-builtin-drivers-y)
---- /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
+--- /dev/null	2007-07-25 20:19:48.826786442 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pcmcia.c	2007-07-25 21:54:05.000000000 -0400
 @@ -0,0 +1,263 @@
 +/*
 + * Sonics Silicon Backplane
@@ -87022,8 +89003,8 @@
 +error:
 +	return -ENODEV;
 +}
---- /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
+--- /dev/null	2007-07-25 20:19:48.826786442 -0400
++++ linux-2.6.22.noarch/drivers/ssb/main.c	2007-07-25 21:54:05.000000000 -0400
 @@ -0,0 +1,1061 @@
 +/*
 + * Sonics Silicon Backplane
@@ -88086,8 +90067,8 @@
 +	bus_unregister(&ssb_bustype);
 +}
 +module_exit(ssb_modexit)
---- /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
+--- /dev/null	2007-07-25 20:19:48.826786442 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pcihost_wrapper.c	2007-07-25 21:54:05.000000000 -0400
 @@ -0,0 +1,104 @@
 +/*
 + * Sonics Silicon Backplane
@@ -88193,8 +90174,8 @@
 +	return pci_register_driver(driver);
 +}
 +EXPORT_SYMBOL(ssb_pcihost_register);
---- /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
+--- /dev/null	2007-07-25 20:19:48.826786442 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_mipscore.c	2007-07-25 21:54:05.000000000 -0400
 @@ -0,0 +1,258 @@
 +/*
 + * Sonics Silicon Backplane
@@ -88454,8 +90435,8 @@
 +	ssb_mips_serial_init(mcore);
 +	ssb_mips_flash_detect(mcore);
 +}
---- /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
+--- /dev/null	2007-07-25 20:19:48.826786442 -0400
++++ linux-2.6.22.noarch/drivers/ssb/ssb_private.h	2007-07-25 21:54:05.000000000 -0400
 @@ -0,0 +1,137 @@
 +#ifndef LINUX_SSB_PRIVATE_H_
 +#define LINUX_SSB_PRIVATE_H_
@@ -88594,8 +90575,8 @@
 +#endif /* CONFIG_SSB_PCIHOST */
 +
 +#endif /* LINUX_SSB_PRIVATE_H_ */
---- /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
+--- /dev/null	2007-07-25 20:19:48.826786442 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pci.c	2007-07-25 21:54:05.000000000 -0400
 @@ -0,0 +1,688 @@
 +/*
 + * Sonics Silicon Backplane PCI-Hostbus related functions.
@@ -89285,8 +91266,8 @@
 +out:
 +	return err;
 +}
---- /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
+--- /dev/null	2007-07-25 20:19:48.826786442 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c	2007-07-25 21:54:05.000000000 -0400
 @@ -0,0 +1,402 @@
 +/*
 + * Sonics Silicon Backplane
@@ -89690,8 +91671,8 @@
 +	return nr_ports;
 +}
 +#endif /* CONFIG_SSB_SERIAL */
---- /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
+--- /dev/null	2007-07-25 20:19:48.826786442 -0400
++++ linux-2.6.22.noarch/drivers/ssb/Kconfig	2007-07-25 21:54:05.000000000 -0400
 @@ -0,0 +1,93 @@
 +menu "Sonics Silicon Backplane"
 +
@@ -89786,8 +91767,8 @@
 +	  If unsure, say N
 +
 +endmenu
---- /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
+--- /dev/null	2007-07-25 20:19:48.826786442 -0400
++++ linux-2.6.22.noarch/drivers/ssb/scan.c	2007-07-25 21:54:05.000000000 -0400
 @@ -0,0 +1,407 @@
 +/*
 + * Sonics Silicon Backplane
@@ -90196,8 +92177,8 @@
 +	ssb_iounmap(bus);
 +	goto out;
 +}
---- /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
+--- /dev/null	2007-07-25 20:19:48.826786442 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c	2007-07-25 21:54:05.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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- kernel.spec	25 Jul 2007 18:20:14 -0000	1.29
+++ kernel.spec	26 Jul 2007 02:18:37 -0000	1.30
@@ -575,7 +575,6 @@
 Patch660: linux-2.6-libata-ali-atapi-dma.patch
 Patch670: linux-2.6-ata-quirk.patch
 Patch680: git-wireless-dev.patch
-Patch681: git-iwlwifi.patch
 Patch690: linux-2.6-e1000-ich9.patch
 Patch710: linux-2.6-bcm43xx-pci-neuter.patch
 #Patch780: linux-2.6-clockevents-fix-resume-logic.patch
@@ -1180,8 +1179,6 @@
 
 # Add the wireless stack updates and drivers from wireless-dev
 ApplyPatch git-wireless-dev.patch
-# Add iwlwifi from intellinuxwireless.org
-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
@@ -2124,6 +2121,10 @@
 %endif
 
 %changelog
+* Wed Jul 25 2007 John W. Linville <linville at redhat.com>
+- Update git-wireless-dev.patch (iwlwifi & rt2x00 updates)
+- Drop git-iwlwifi.patch
+
 * Wed Jul 25 2007 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.23-rc1-git1
 


--- git-iwlwifi.patch DELETED ---




More information about the fedora-extras-commits mailing list