rpms/kernel/devel git-wireless-dev.patch, 1.20, 1.21 kernel.spec, 1.19, 1.20

John W. Linville (linville) fedora-extras-commits at redhat.com
Fri Jul 20 20:24:59 UTC 2007


Author: linville

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

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

git-wireless-dev.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.20 -r 1.21 git-wireless-dev.patch
Index: git-wireless-dev.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/git-wireless-dev.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- git-wireless-dev.patch	19 Jul 2007 20:42:36 -0000	1.20
+++ git-wireless-dev.patch	20 Jul 2007 20:24:26 -0000	1.21
@@ -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-19 16:30:16.000000000 -0400
++++ linux-2.6.22.noarch/CREDITS	2007-07-20 16:09:58.000000000 -0400
 @@ -665,6 +665,11 @@ D: Minor updates to SCSI types, added /p
  S: (ask for current address)
  S: USA
@@ -67,8 +67,8 @@
  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-19 16:30:17.000000000 -0400
-@@ -7,6 +7,217 @@
++++ linux-2.6.22.noarch/include/linux/nl80211.h	2007-07-20 16:09:58.000000000 -0400
+@@ -7,6 +7,201 @@
   */
  
  /**
@@ -254,22 +254,6 @@
 +};
 +#define NL80211_ATTR_MAX (__NL80211_ATTR_AFTER_LAST - 1)
 +
-+/**
-+ * enum nl80211_multicast_groups - multicast groups for nl80211
-+ * @NL80211_GROUP_CONFIG: members of this group are notified of
-+ *	configuration changes
-+ */
-+enum nl80211_multicast_groups {
-+	/* be notified of configuration changes like wiphy renames */
-+	NL80211_GROUP_CONFIG,
-+
-+	/* add groups here */
-+
-+	/* keep last */
-+	__NL80211_GROUP_AFTER_LAST
-+};
-+#define NL80211_GROUP_MAX (__NL80211_GROUP_AFTER_LAST - 1)
-+
 +/*
 + * maximum length of IE(s) passed in an NL80211_ATTR_IE.
 + * this is an arbitrary limit, 774 means three full-length
@@ -286,7 +270,7 @@
   * enum nl80211_iftype - (virtual) interface types
   * @NL80211_IFTYPE_UNSPECIFIED: unspecified type, driver decides
   * @NL80211_IFTYPE_ADHOC: independent BSS member
-@@ -35,4 +246,56 @@ enum nl80211_iftype {
+@@ -35,4 +230,56 @@ enum nl80211_iftype {
  };
  #define NL80211_IFTYPE_MAX (__NL80211_IFTYPE_AFTER_LAST - 1)
  
@@ -343,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-19 16:27:54.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/ieee80211.h	2007-07-19 16:30:17.000000000 -0400
+--- linux-2.6.22.noarch/include/linux/ieee80211.h.orig	2007-07-20 16:09:05.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/ieee80211.h	2007-07-20 16:09:58.000000000 -0400
 @@ -106,6 +106,75 @@ struct ieee80211_hdr {
  } __attribute__ ((packed));
  
@@ -643,8 +627,8 @@
 +};
 +
  #endif /* IEEE80211_H */
---- /dev/null	2007-07-19 08:33:28.353042235 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h	2007-07-19 16:30:17.000000000 -0400
+--- /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:09:58.000000000 -0400
 @@ -0,0 +1,387 @@
 +#ifndef LINUX_SSB_CHIPCO_H_
 +#define LINUX_SSB_CHIPCO_H_
@@ -1033,8 +1017,8 @@
 +
 +#endif /* __KERNEL__ */
 +#endif /* LINUX_SSB_CHIPCO_H_ */
---- /dev/null	2007-07-19 08:33:28.353042235 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h	2007-07-19 16:30:17.000000000 -0400
+--- /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:09:58.000000000 -0400
 @@ -0,0 +1,163 @@
 +/*
 + * Hardware-specific External Interface I/O core definitions
@@ -1199,8 +1183,8 @@
 +
 +#endif /* __KERNEL__ */
 +#endif /* LINUX_SSB_EXTIFCORE_H_ */
---- /dev/null	2007-07-19 08:33:28.353042235 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h	2007-07-19 16:30:17.000000000 -0400
+--- /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:09:58.000000000 -0400
 @@ -0,0 +1,47 @@
 +#ifndef LINUX_SSB_MIPSCORE_H_
 +#define LINUX_SSB_MIPSCORE_H_
@@ -1249,8 +1233,8 @@
 +
 +#endif /* __KERNEL__ */
 +#endif /* LINUX_SSB_MIPSCORE_H_ */
---- /dev/null	2007-07-19 08:33:28.353042235 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h	2007-07-19 16:30:17.000000000 -0400
+--- /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:09:58.000000000 -0400
 @@ -0,0 +1,294 @@
 +#ifndef LINUX_SSB_REGS_H_
 +#define LINUX_SSB_REGS_H_
@@ -1546,8 +1530,8 @@
 +
 +#endif /* __KERNEL__ */
 +#endif /* LINUX_SSB_REGS_H_ */
---- /dev/null	2007-07-19 08:33:28.353042235 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h	2007-07-19 16:30:17.000000000 -0400
+--- /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:09:58.000000000 -0400
 @@ -0,0 +1,108 @@
 +#ifndef LINUX_SSB_PCICORE_H_
 +#define LINUX_SSB_PCICORE_H_
@@ -1657,8 +1641,8 @@
 +#endif /* CONFIG_SSB_DRIVER_PCICORE */
 +#endif /* __KERNEL__ */
 +#endif /* LINUX_SSB_PCICORE_H_ */
---- /dev/null	2007-07-19 08:33:28.353042235 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb.h	2007-07-19 16:30:17.000000000 -0400
+--- /dev/null	2007-07-20 08:31:48.355055592 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb.h	2007-07-20 16:09:58.000000000 -0400
 @@ -0,0 +1,422 @@
 +#ifndef LINUX_SSB_H_
 +#define LINUX_SSB_H_
@@ -2082,8 +2066,8 @@
 +
 +#endif /* __KERNEL__ */
 +#endif /* LINUX_SSB_H_ */
---- linux-2.6.22.noarch/include/net/cfg80211.h.orig	2007-07-19 16:27:55.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/cfg80211.h	2007-07-19 16:30:17.000000000 -0400
+--- linux-2.6.22.noarch/include/net/cfg80211.h.orig	2007-07-20 16:09:05.000000000 -0400
++++ linux-2.6.22.noarch/include/net/cfg80211.h	2007-07-20 16:09:58.000000000 -0400
 @@ -3,6 +3,7 @@
  
  #include <linux/netlink.h>
@@ -2226,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-19 16:27:56.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/mac80211.h	2007-07-19 16:30:17.000000000 -0400
+--- linux-2.6.22.noarch/include/net/mac80211.h.orig	2007-07-20 16:09:05.000000000 -0400
++++ linux-2.6.22.noarch/include/net/mac80211.h	2007-07-20 16:09:58.000000000 -0400
 @@ -300,7 +300,6 @@ struct ieee80211_conf {
  	/* Following five fields are used for IEEE 802.11H */
  	unsigned int radar_detect;
@@ -2256,7 +2240,22 @@
  	int (*set_port_auth)(struct ieee80211_hw *hw, u8 *addr,
  			     int authorized);
  
-@@ -702,8 +703,9 @@ struct ieee80211_ops {
+@@ -692,6 +693,14 @@ struct ieee80211_ops {
+ 	void (*sta_table_notification)(struct ieee80211_hw *hw,
+ 				       int num_sta);
+ 
++	/* Handle ERP IE change notifications. Must be atomic. */
++	void (*erp_ie_changed)(struct ieee80211_hw *hw, u8 changes,
++			       int cts_protection, int preamble);
++
++	/* Flags for the erp_ie_changed changes parameter */
++#define IEEE80211_ERP_CHANGE_PROTECTION (1<<0) /* protection flag changed */
++#define IEEE80211_ERP_CHANGE_PREAMBLE (1<<1) /* barker preamble mode changed */
++
+ 	/* 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 {
  	/* 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
@@ -2268,7 +2267,7 @@
  	int (*get_tx_stats)(struct ieee80211_hw *hw,
  			    struct ieee80211_tx_queue_stats *stats);
  
-@@ -713,12 +715,25 @@ struct ieee80211_ops {
+@@ -713,12 +723,25 @@ struct ieee80211_ops {
  	 * Must be atomic. */
  	u64 (*get_tsf)(struct ieee80211_hw *hw);
  
@@ -2294,8 +2293,90 @@
  	/* 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
+ /**
+  * ieee80211_rts_get - RTS frame generation function
+  * @hw: pointer obtained from ieee80211_alloc_hw().
++ * @if_id: interface ID from &struct ieee80211_if_init_conf.
+  * @frame: pointer to the frame that is going to be protected by the RTS.
[...6452 lines suppressed...]
 +	 */
-+	spec->mac_addr = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
 +	spec->num_modes = 2;
 +	spec->num_rates = 12;
 +	spec->num_channels = 14;
@@ -85889,10 +86506,15 @@
 +	rt73usb_init_hw_mode(rt2x00dev);
 +
 +	/*
-+	 * rt73usb requires firmware
++	 * This device requires firmware
 +	 */
 +	__set_bit(FIRMWARE_REQUIRED, &rt2x00dev->flags);
 +
++	/*
++	 * Set the rssi offset.
++	 */
++	rt2x00dev->rssi_offset = DEFAULT_RSSI_OFFSET;
++
 +	return 0;
 +}
 +
@@ -85958,8 +86580,6 @@
 +static const struct ieee80211_ops rt73usb_mac80211_ops = {
 +	.tx			= rt2x00lib_tx,
 +	.reset			= rt2x00lib_reset,
-+	.open			= rt2x00lib_open,
-+	.stop			= rt2x00lib_stop,
 +	.add_interface		= rt2x00lib_add_interface,
 +	.remove_interface	= rt2x00lib_remove_interface,
 +	.config			= rt2x00lib_config,
@@ -85985,6 +86605,7 @@
 +	.write_tx_desc		= rt73usb_write_tx_desc,
 +	.write_tx_data		= rt2x00usb_write_tx_data,
 +	.kick_tx_queue		= rt73usb_kick_tx_queue,
++	.fill_rxdone		= rt73usb_fill_rxdone,
 +	.config_type		= rt73usb_config_type,
 +	.config_phymode		= rt73usb_config_phymode,
 +	.config_channel		= rt73usb_config_channel,
@@ -86087,26 +86708,23 @@
 +
 +static int __init rt73usb_init(void)
 +{
-+	printk(KERN_INFO "Loading module: %s - %s by %s.\n",
-+		DRV_NAME, DRV_VERSION, DRV_PROJECT);
 +	return usb_register(&rt73usb_driver);
 +}
 +
 +static void __exit rt73usb_exit(void)
 +{
-+	printk(KERN_INFO "Unloading module: %s.\n", DRV_NAME);
 +	usb_deregister(&rt73usb_driver);
 +}
 +
 +module_init(rt73usb_init);
 +module_exit(rt73usb_exit);
---- /dev/null	2007-07-19 08:33:28.353042235 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/README	2007-07-19 16:30:16.000000000 -0400
+--- /dev/null	2007-07-20 08:31:48.355055592 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/mac80211/README	2007-07-20 16:09:58.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-19 16:27:51.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig	2007-07-19 16:30:16.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig	2007-07-20 16:09:04.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig	2007-07-20 16:09:58.000000000 -0400
 @@ -562,4 +562,6 @@ source "drivers/net/wireless/hostap/Kcon
  source "drivers/net/wireless/bcm43xx/Kconfig"
  source "drivers/net/wireless/zd1211rw/Kconfig"
@@ -86115,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-19 16:30:16.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/Kconfig	2007-07-20 16:09:58.000000000 -0400
 @@ -1,6 +1,7 @@
  config BCM43XX
  	tristate "Broadcom BCM43xx wireless support"
@@ -86124,8 +86742,8 @@
  	select WIRELESS_EXT
  	select FW_LOADER
  	select HW_RANDOM
---- /dev/null	2007-07-19 08:33:28.353042235 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/Makefile	2007-07-19 16:30:17.000000000 -0400
+--- /dev/null	2007-07-20 08:31:48.355055592 -0400
++++ linux-2.6.22.noarch/drivers/ssb/Makefile	2007-07-20 16:09:58.000000000 -0400
 @@ -0,0 +1,11 @@
 +ssb-builtin-drivers-y					+= driver_chipcommon.o
 +ssb-builtin-drivers-$(CONFIG_SSB_DRIVER_MIPS)		+= driver_mipscore.o
@@ -86138,8 +86756,8 @@
 +
 +ssb-objs	:= main.o scan.o \
 +		   $(ssb-hostsupport-y) $(ssb-builtin-drivers-y)
---- /dev/null	2007-07-19 08:33:28.353042235 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pcmcia.c	2007-07-19 16:30:17.000000000 -0400
+--- /dev/null	2007-07-20 08:31:48.355055592 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pcmcia.c	2007-07-20 16:09:58.000000000 -0400
 @@ -0,0 +1,263 @@
 +/*
 + * Sonics Silicon Backplane
@@ -86404,8 +87022,8 @@
 +error:
 +	return -ENODEV;
 +}
---- /dev/null	2007-07-19 08:33:28.353042235 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/main.c	2007-07-19 16:30:17.000000000 -0400
+--- /dev/null	2007-07-20 08:31:48.355055592 -0400
++++ linux-2.6.22.noarch/drivers/ssb/main.c	2007-07-20 16:09:58.000000000 -0400
 @@ -0,0 +1,1061 @@
 +/*
 + * Sonics Silicon Backplane
@@ -87468,8 +88086,8 @@
 +	bus_unregister(&ssb_bustype);
 +}
 +module_exit(ssb_modexit)
---- /dev/null	2007-07-19 08:33:28.353042235 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pcihost_wrapper.c	2007-07-19 16:30:17.000000000 -0400
+--- /dev/null	2007-07-20 08:31:48.355055592 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pcihost_wrapper.c	2007-07-20 16:09:58.000000000 -0400
 @@ -0,0 +1,104 @@
 +/*
 + * Sonics Silicon Backplane
@@ -87575,8 +88193,8 @@
 +	return pci_register_driver(driver);
 +}
 +EXPORT_SYMBOL(ssb_pcihost_register);
---- /dev/null	2007-07-19 08:33:28.353042235 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_mipscore.c	2007-07-19 16:30:17.000000000 -0400
+--- /dev/null	2007-07-20 08:31:48.355055592 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_mipscore.c	2007-07-20 16:09:58.000000000 -0400
 @@ -0,0 +1,258 @@
 +/*
 + * Sonics Silicon Backplane
@@ -87836,8 +88454,8 @@
 +	ssb_mips_serial_init(mcore);
 +	ssb_mips_flash_detect(mcore);
 +}
---- /dev/null	2007-07-19 08:33:28.353042235 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/ssb_private.h	2007-07-19 16:30:17.000000000 -0400
+--- /dev/null	2007-07-20 08:31:48.355055592 -0400
++++ linux-2.6.22.noarch/drivers/ssb/ssb_private.h	2007-07-20 16:09:58.000000000 -0400
 @@ -0,0 +1,137 @@
 +#ifndef LINUX_SSB_PRIVATE_H_
 +#define LINUX_SSB_PRIVATE_H_
@@ -87976,8 +88594,8 @@
 +#endif /* CONFIG_SSB_PCIHOST */
 +
 +#endif /* LINUX_SSB_PRIVATE_H_ */
---- /dev/null	2007-07-19 08:33:28.353042235 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pci.c	2007-07-19 16:30:17.000000000 -0400
+--- /dev/null	2007-07-20 08:31:48.355055592 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pci.c	2007-07-20 16:09:58.000000000 -0400
 @@ -0,0 +1,688 @@
 +/*
 + * Sonics Silicon Backplane PCI-Hostbus related functions.
@@ -88667,8 +89285,8 @@
 +out:
 +	return err;
 +}
---- /dev/null	2007-07-19 08:33:28.353042235 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c	2007-07-19 16:30:17.000000000 -0400
+--- /dev/null	2007-07-20 08:31:48.355055592 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c	2007-07-20 16:09:58.000000000 -0400
 @@ -0,0 +1,402 @@
 +/*
 + * Sonics Silicon Backplane
@@ -89072,8 +89690,8 @@
 +	return nr_ports;
 +}
 +#endif /* CONFIG_SSB_SERIAL */
---- /dev/null	2007-07-19 08:33:28.353042235 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/Kconfig	2007-07-19 16:30:17.000000000 -0400
+--- /dev/null	2007-07-20 08:31:48.355055592 -0400
++++ linux-2.6.22.noarch/drivers/ssb/Kconfig	2007-07-20 16:09:58.000000000 -0400
 @@ -0,0 +1,93 @@
 +menu "Sonics Silicon Backplane"
 +
@@ -89168,8 +89786,8 @@
 +	  If unsure, say N
 +
 +endmenu
---- /dev/null	2007-07-19 08:33:28.353042235 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/scan.c	2007-07-19 16:30:17.000000000 -0400
+--- /dev/null	2007-07-20 08:31:48.355055592 -0400
++++ linux-2.6.22.noarch/drivers/ssb/scan.c	2007-07-20 16:09:58.000000000 -0400
 @@ -0,0 +1,407 @@
 +/*
 + * Sonics Silicon Backplane
@@ -89578,8 +90196,8 @@
 +	ssb_iounmap(bus);
 +	goto out;
 +}
---- /dev/null	2007-07-19 08:33:28.353042235 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c	2007-07-19 16:30:17.000000000 -0400
+--- /dev/null	2007-07-20 08:31:48.355055592 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c	2007-07-20 16:09:58.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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- kernel.spec	20 Jul 2007 19:52:27 -0000	1.19
+++ kernel.spec	20 Jul 2007 20:24:26 -0000	1.20
@@ -2133,6 +2133,9 @@
 %endif
 
 %changelog
+* Fri Jul 20 2007 John W. Linville <linville at redhat.com>
+- Update git-wireless-dev.patch (rt2x00 update)
+
 * Fri Jul 20 2007 Dave Jones <davej at redhat.com>
 - 2.6.22-git14
 




More information about the scm-commits mailing list