rpms/kernel/devel linux-2.6-wireless.patch, 1.6, 1.7 git-wireless-dev.patch, 1.35, 1.36 kernel.spec, 1.168, 1.169 linux-2.6-wireless-pending.patch, 1.3, 1.4 linux-2.6-iwlwifi-fw-name-compat.patch, 1.1, NONE
John W. Linville (linville)
fedora-extras-commits at redhat.com
Tue Sep 18 14:01:43 UTC 2007
- Previous message (by thread): rpms/eclipse-subclipse/F-7 subclipse-fetch-1.2.4.sh, NONE, 1.1 .cvsignore, 1.5, 1.6 eclipse-subclipse-1.2.2-plugin-classpath.patch, 1.1, 1.2 eclipse-subclipse.spec, 1.5, 1.6 sources, 1.5, 1.6 subclipse-fetch-1.2.2.sh, 1.1, NONE
- Next message (by thread): rpms/perl-DateTime/devel .cvsignore, 1.16, 1.17 perl-DateTime.spec, 1.20, 1.21 sources, 1.16, 1.17
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: linville
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2577
Modified Files:
git-wireless-dev.patch kernel.spec
linux-2.6-wireless-pending.patch
Added Files:
linux-2.6-wireless.patch
Removed Files:
linux-2.6-iwlwifi-fw-name-compat.patch
Log Message:
wireless update
linux-2.6-wireless.patch:
Index: linux-2.6-wireless.patch
===================================================================
RCS file: linux-2.6-wireless.patch
diff -N linux-2.6-wireless.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ linux-2.6-wireless.patch 18 Sep 2007 14:01:35 -0000 1.7
@@ -0,0 +1,66 @@
+diff -up linux-2.6.22.noarch/net/mac80211/ieee80211.c.orig linux-2.6.22.noarch/net/mac80211/ieee80211.c
+--- linux-2.6.22.noarch/net/mac80211/ieee80211.c.orig 2007-09-18 09:34:44.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211.c 2007-09-18 09:35:22.000000000 -0400
+@@ -5259,7 +5259,7 @@ static void __exit ieee80211_exit(void)
+ }
+
+
+-module_init(ieee80211_init);
++subsys_initcall(ieee80211_init);
+ module_exit(ieee80211_exit);
+
+ MODULE_DESCRIPTION("IEEE 802.11 subsystem");
+diff -up linux-2.6.22.noarch/net/mac80211/wme.c.orig linux-2.6.22.noarch/net/mac80211/wme.c
+--- 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-09-18 09:35:22.000000000 -0400
+@@ -424,7 +424,7 @@ static int wme_qdiscop_init(struct Qdisc
+ skb_queue_head_init(&q->requeued[i]);
+ q->queues[i] = qdisc_create_dflt(qd->dev, &pfifo_qdisc_ops,
+ qd->handle);
+- if (q->queues[i] == 0) {
++ if (!q->queues[i]) {
+ q->queues[i] = &noop_qdisc;
+ printk(KERN_ERR "%s child qdisc %i creation failed", dev->name, i);
+ }
+diff -up linux-2.6.22.noarch/net/mac80211/rc80211_simple.c.orig linux-2.6.22.noarch/net/mac80211/rc80211_simple.c
+--- linux-2.6.22.noarch/net/mac80211/rc80211_simple.c.orig 2007-09-18 09:34:44.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/rc80211_simple.c 2007-09-18 09:35:22.000000000 -0400
+@@ -431,7 +431,7 @@ static void __exit rate_control_simple_e
+ }
+
+
+-module_init(rate_control_simple_init);
++subsys_initcall(rate_control_simple_init);
+ module_exit(rate_control_simple_exit);
+
+ MODULE_DESCRIPTION("Simple rate control algorithm for ieee80211");
+diff -up linux-2.6.22.noarch/net/wireless/core.c.orig linux-2.6.22.noarch/net/wireless/core.c
+--- 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-09-18 09:35:22.000000000 -0400
+@@ -213,7 +213,7 @@ out_fail_notifier:
+ out_fail_sysfs:
+ return err;
+ }
+-module_init(cfg80211_init);
++subsys_initcall(cfg80211_init);
+
+ static void cfg80211_exit(void)
+ {
+diff -up linux-2.6.22.noarch/net/wireless/sysfs.c.orig linux-2.6.22.noarch/net/wireless/sysfs.c
+--- 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-09-18 09:35:22.000000000 -0400
+@@ -52,12 +52,14 @@ static void wiphy_dev_release(struct dev
+ cfg80211_dev_free(rdev);
+ }
+
++#ifdef CONFIG_HOTPLUG
+ static int wiphy_uevent(struct device *dev, char **envp,
+ int num_envp, char *buf, int size)
+ {
+ /* TODO, we probably need stuff here */
+ return 0;
+ }
++#endif
+
+ struct class ieee80211_class = {
+ .name = "ieee80211",
git-wireless-dev.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.35 -r 1.36 git-wireless-dev.patch
Index: git-wireless-dev.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/git-wireless-dev.patch,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- git-wireless-dev.patch 1 Sep 2007 00:32:49 -0000 1.35
+++ git-wireless-dev.patch 18 Sep 2007 14:01:35 -0000 1.36
@@ -1,5 +1,6 @@
---- linux-2.6.22.noarch/CREDITS.orig 2007-08-30 16:13:22.000000000 -0400
-+++ linux-2.6.22.noarch/CREDITS 2007-08-30 16:13:50.000000000 -0400
+diff -up linux-2.6.22.noarch/CREDITS.orig linux-2.6.22.noarch/CREDITS
+--- linux-2.6.22.noarch/CREDITS.orig 2007-09-18 09:42:44.000000000 -0400
++++ linux-2.6.22.noarch/CREDITS 2007-09-18 09:44:18.000000000 -0400
@@ -665,6 +665,11 @@ D: Minor updates to SCSI types, added /p
S: (ask for current address)
S: USA
@@ -66,8 +67,9 @@
N: Lars Wirzenius
E: liw at iki.fi
D: Linux System Administrator's Guide, author, former maintainer
+diff -up linux-2.6.22.noarch/include/linux/nl80211.h.orig linux-2.6.22.noarch/include/linux/nl80211.h
--- 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-08-30 16:13:51.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/nl80211.h 2007-09-18 09:44:19.000000000 -0400
@@ -7,6 +7,201 @@
*/
@@ -327,8 +329,9 @@
+#define NL80211_KEYTYPE_MAX (__NL80211_KEYTYPE_AFTER_LAST - 1)
+
#endif /* __LINUX_NL80211_H */
---- linux-2.6.22.noarch/include/linux/mod_devicetable.h.orig 2007-08-30 16:13:30.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/mod_devicetable.h 2007-08-30 16:13:51.000000000 -0400
+diff -up linux-2.6.22.noarch/include/linux/mod_devicetable.h.orig linux-2.6.22.noarch/include/linux/mod_devicetable.h
+--- linux-2.6.22.noarch/include/linux/mod_devicetable.h.orig 2007-09-18 09:42:54.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/mod_devicetable.h 2007-09-18 09:44:19.000000000 -0400
@@ -340,4 +340,19 @@ struct parisc_device_id {
#define PA_HVERSION_ANY_ID 0xffff
#define PA_SVERSION_ANY_ID 0xffffffff
@@ -349,8 +352,9 @@
+#define SSB_ANY_REV 0xFF
+
#endif /* LINUX_MOD_DEVICETABLE_H */
---- linux-2.6.22.noarch/include/linux/ieee80211.h.orig 2007-08-30 16:13:30.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/ieee80211.h 2007-08-30 16:13:51.000000000 -0400
+diff -up linux-2.6.22.noarch/include/linux/ieee80211.h.orig linux-2.6.22.noarch/include/linux/ieee80211.h
+--- linux-2.6.22.noarch/include/linux/ieee80211.h.orig 2007-09-18 09:42:53.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/ieee80211.h 2007-09-18 09:44:19.000000000 -0400
@@ -106,6 +106,75 @@ struct ieee80211_hdr {
} __attribute__ ((packed));
@@ -649,8 +653,9 @@
+};
+
#endif /* IEEE80211_H */
---- /dev/null 2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h 2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h
+--- /dev/null 2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h 2007-09-18 09:44:19.000000000 -0400
@@ -0,0 +1,396 @@
+#ifndef LINUX_SSB_CHIPCO_H_
+#define LINUX_SSB_CHIPCO_H_
@@ -1048,8 +1053,9 @@
+#endif /* CONFIG_SSB_SERIAL */
+
+#endif /* LINUX_SSB_CHIPCO_H_ */
---- /dev/null 2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h 2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h
+--- /dev/null 2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h 2007-09-18 09:44:19.000000000 -0400
@@ -0,0 +1,204 @@
+/*
+ * Hardware-specific External Interface I/O core definitions
@@ -1255,8 +1261,9 @@
+
+#endif /* CONFIG_SSB_DRIVER_EXTIF */
+#endif /* LINUX_SSB_EXTIFCORE_H_ */
---- /dev/null 2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h 2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h
+--- /dev/null 2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h 2007-09-18 09:44:19.000000000 -0400
@@ -0,0 +1,46 @@
+#ifndef LINUX_SSB_MIPSCORE_H_
+#define LINUX_SSB_MIPSCORE_H_
@@ -1304,8 +1311,9 @@
+#endif /* CONFIG_SSB_DRIVER_MIPS */
+
+#endif /* LINUX_SSB_MIPSCORE_H_ */
---- /dev/null 2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h 2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h
+--- /dev/null 2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h 2007-09-18 09:44:19.000000000 -0400
@@ -0,0 +1,292 @@
+#ifndef LINUX_SSB_REGS_H_
+#define LINUX_SSB_REGS_H_
@@ -1599,8 +1607,9 @@
+
+
+#endif /* LINUX_SSB_REGS_H_ */
---- /dev/null 2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h 2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h
+--- /dev/null 2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h 2007-09-18 09:44:19.000000000 -0400
@@ -0,0 +1,106 @@
+#ifndef LINUX_SSB_PCICORE_H_
+#define LINUX_SSB_PCICORE_H_
@@ -1708,8 +1717,9 @@
+
+#endif /* CONFIG_SSB_DRIVER_PCICORE */
+#endif /* LINUX_SSB_PCICORE_H_ */
---- /dev/null 2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb.h 2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/include/linux/ssb/ssb.h
+--- /dev/null 2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb.h 2007-09-18 09:44:19.000000000 -0400
@@ -0,0 +1,424 @@
+#ifndef LINUX_SSB_H_
+#define LINUX_SSB_H_
@@ -2135,8 +2145,9 @@
+
+
+#endif /* LINUX_SSB_H_ */
---- linux-2.6.22.noarch/include/net/cfg80211.h.orig 2007-08-30 16:13:30.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/cfg80211.h 2007-08-30 16:13:51.000000000 -0400
+diff -up linux-2.6.22.noarch/include/net/cfg80211.h.orig linux-2.6.22.noarch/include/net/cfg80211.h
+--- linux-2.6.22.noarch/include/net/cfg80211.h.orig 2007-09-18 09:42:54.000000000 -0400
++++ linux-2.6.22.noarch/include/net/cfg80211.h 2007-09-18 09:44:19.000000000 -0400
@@ -3,6 +3,7 @@
#include <linux/netlink.h>
@@ -2279,11 +2290,12 @@
+ u32 seq, int flags, u8 cmd);
+
#endif /* __NET_CFG80211_H */
---- linux-2.6.22.noarch/include/net/mac80211.h.orig 2007-08-30 16:13:31.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/mac80211.h 2007-08-30 16:13:51.000000000 -0400
-@@ -539,6 +539,9 @@ struct ieee80211_hw {
- * per-packet RC4 key with each TX frame when doing hwcrypto */
- #define IEEE80211_HW_TKIP_REQ_PHASE2_KEY (1<<14)
+diff -up linux-2.6.22.noarch/include/net/mac80211.h.orig linux-2.6.22.noarch/include/net/mac80211.h
+--- linux-2.6.22.noarch/include/net/mac80211.h.orig 2007-09-18 09:42:58.000000000 -0400
++++ linux-2.6.22.noarch/include/net/mac80211.h 2007-09-18 09:44:19.000000000 -0400
+@@ -563,6 +563,9 @@ struct ieee80211_hw {
+ * specified in the device's EEPROM */
+ #define IEEE80211_HW_DEFAULT_REG_DOMAIN_CONFIGURED (1<<11)
+ /* The device capable of supporting 11n */
+#define IEEE80211_HW_SUPPORT_HT_MODE (1<<15)
@@ -2291,7 +2303,7 @@
u32 flags; /* hardware flags defined above */
/* Set to the size of a needed device specific skb headroom for TX skbs. */
-@@ -691,8 +694,7 @@ struct ieee80211_ops {
+@@ -708,8 +711,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
@@ -2301,7 +2313,7 @@
int (*set_port_auth)(struct ieee80211_hw *hw, u8 *addr,
int authorized);
-@@ -752,8 +754,9 @@ struct ieee80211_ops {
+@@ -769,8 +771,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
@@ -2313,7 +2325,7 @@
int (*get_tx_stats)(struct ieee80211_hw *hw,
struct ieee80211_tx_queue_stats *stats);
-@@ -769,6 +772,22 @@ struct ieee80211_ops {
+@@ -786,6 +789,22 @@ struct ieee80211_ops {
* TSF synchronization. */
void (*reset_tsf)(struct ieee80211_hw *hw);
@@ -2336,8 +2348,9 @@
/* 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. */
+diff -up linux-2.6.22.noarch/include/net/iw_handler.h.orig linux-2.6.22.noarch/include/net/iw_handler.h
--- 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-08-30 16:13:51.000000000 -0400
++++ linux-2.6.22.noarch/include/net/iw_handler.h 2007-09-18 09:44:19.000000000 -0400
@@ -431,7 +431,13 @@ struct iw_public_data {
* Those may be called only within the kernel.
*/
@@ -2353,9 +2366,10 @@
/* Send a single event to user space */
extern void wireless_send_event(struct net_device * dev,
---- linux-2.6.22.noarch/MAINTAINERS.orig 2007-08-30 16:13:22.000000000 -0400
-+++ linux-2.6.22.noarch/MAINTAINERS 2007-08-30 16:13:50.000000000 -0400
-@@ -283,6 +283,14 @@ M: corentin.labbe at geomatys.fr
+diff -up linux-2.6.22.noarch/MAINTAINERS.orig linux-2.6.22.noarch/MAINTAINERS
[...111839 lines suppressed...]
++static void rs_clear(void *priv)
++{
++ return;
+}
+
++
+static void *rs_alloc_sta(void *priv, gfp_t gfp)
+{
+ struct iwl_rate_scale_priv *rs_priv;
@@ -123243,11 +131884,6 @@
+ IWL_DEBUG_RATE("leave\n");
+}
+
-+static void rs_clear(void *priv)
-+{
-+ IWL_DEBUG_RATE("NOP\n");
-+}
-+
+/**
+ * rs_tx_status - Update rate control values based on Tx results
+ *
@@ -123742,8 +132378,7 @@
+
+ if (!local->rate_ctrl->ops->name ||
+ strcmp(local->rate_ctrl->ops->name, RS_NAME)) {
-+ IWL_WARNING("iwl-3945-rs not selected as rate control "
-+ "aglo!\n");
++ IWL_WARNING("iwl-3945-rs not selected as rate control algo!\n");
+ IWL_DEBUG_RATE("leave - mac80211 picked the wrong RC algo.\n");
+ return;
+ }
@@ -123797,19 +132432,20 @@
+ iwl_rates[rs_priv->start_rate].plcp);
+}
+
-+void iwl_rate_control_register(void)
++void iwl_rate_control_register(struct ieee80211_hw *hw)
+{
+ ieee80211_rate_control_register(&rs_ops);
+}
+
-+void iwl_rate_control_unregister(void)
++void iwl_rate_control_unregister(struct ieee80211_hw *hw)
+{
+ ieee80211_rate_control_unregister(&rs_ops);
+}
+
+
---- /dev/null 2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/b43_pci_bridge.c 2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/b43_pci_bridge.c
+--- /dev/null 2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/b43_pci_bridge.c 2007-09-18 09:44:19.000000000 -0400
@@ -0,0 +1,46 @@
+/*
+ * Broadcom 43xx PCI-SSB bridge module
@@ -123857,8 +132493,9 @@
+{
+ ssb_pcihost_unregister(&b43_pci_bridge_driver);
+}
---- /dev/null 2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/Makefile 2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/Makefile
+--- /dev/null 2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/Makefile 2007-09-18 09:44:19.000000000 -0400
@@ -0,0 +1,18 @@
+# core
+ssb-y += main.o scan.o
@@ -123878,8 +132515,9 @@
+ssb-$(CONFIG_SSB_PCIHOST) += b43_pci_bridge.o
+
+obj-$(CONFIG_SSB) += ssb.o
---- /dev/null 2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pcmcia.c 2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/pcmcia.c
+--- /dev/null 2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pcmcia.c 2007-09-18 09:44:19.000000000 -0400
@@ -0,0 +1,271 @@
+/*
+ * Sonics Silicon Backplane
@@ -124152,8 +132790,9 @@
+error:
+ return -ENODEV;
+}
---- /dev/null 2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/main.c 2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/main.c
+--- /dev/null 2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/main.c 2007-09-18 09:44:19.000000000 -0400
@@ -0,0 +1,1162 @@
+/*
+ * Sonics Silicon Backplane
@@ -125317,8 +133956,9 @@
+ bus_unregister(&ssb_bustype);
+}
+module_exit(ssb_modexit)
---- /dev/null 2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pcihost_wrapper.c 2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/pcihost_wrapper.c
+--- /dev/null 2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pcihost_wrapper.c 2007-09-18 09:44:19.000000000 -0400
@@ -0,0 +1,104 @@
+/*
+ * Sonics Silicon Backplane
@@ -125424,8 +134064,9 @@
+ return pci_register_driver(driver);
+}
+EXPORT_SYMBOL(ssb_pcihost_register);
---- /dev/null 2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_mipscore.c 2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/driver_mipscore.c
+--- /dev/null 2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_mipscore.c 2007-09-18 09:44:19.000000000 -0400
@@ -0,0 +1,223 @@
+/*
+ * Sonics Silicon Backplane
@@ -125650,8 +134291,9 @@
+ ssb_mips_serial_init(mcore);
+ ssb_mips_flash_detect(mcore);
+}
---- /dev/null 2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/ssb_private.h 2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/ssb_private.h
+--- /dev/null 2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/ssb_private.h 2007-09-18 09:44:19.000000000 -0400
@@ -0,0 +1,136 @@
+#ifndef LINUX_SSB_PRIVATE_H_
+#define LINUX_SSB_PRIVATE_H_
@@ -125789,8 +134431,9 @@
+#endif /* CONFIG_SSB_PCIHOST */
+
+#endif /* LINUX_SSB_PRIVATE_H_ */
---- /dev/null 2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pci.c 2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/pci.c
+--- /dev/null 2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pci.c 2007-09-18 09:44:19.000000000 -0400
@@ -0,0 +1,740 @@
+/*
+ * Sonics Silicon Backplane PCI-Hostbus related functions.
@@ -126532,8 +135175,9 @@
+out:
+ return err;
+}
---- /dev/null 2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c 2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c
+--- /dev/null 2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c 2007-09-18 09:44:19.000000000 -0400
@@ -0,0 +1,446 @@
+/*
+ * Sonics Silicon Backplane
@@ -126981,8 +135625,9 @@
+ return nr_ports;
+}
+#endif /* CONFIG_SSB_SERIAL */
---- /dev/null 2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/Kconfig 2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/Kconfig
+--- /dev/null 2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/Kconfig 2007-09-18 09:44:19.000000000 -0400
@@ -0,0 +1,117 @@
+menu "Sonics Silicon Backplane"
+
@@ -127101,8 +135746,9 @@
+ If unsure, say N
+
+endmenu
---- /dev/null 2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/scan.c 2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/scan.c
+--- /dev/null 2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/scan.c 2007-09-18 09:44:19.000000000 -0400
@@ -0,0 +1,413 @@
+/*
+ * Sonics Silicon Backplane
@@ -127517,8 +136163,9 @@
+ ssb_iounmap(bus);
+ goto out;
+}
---- /dev/null 2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_extif.c 2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/driver_extif.c
+--- /dev/null 2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_extif.c 2007-09-18 09:44:19.000000000 -0400
@@ -0,0 +1,129 @@
+/*
+ * Sonics Silicon Backplane
@@ -127649,8 +136296,9 @@
+ mask, value);
+}
+
---- /dev/null 2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c 2007-08-30 16:13:51.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c
+--- /dev/null 2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c 2007-09-18 09:44:19.000000000 -0400
@@ -0,0 +1,576 @@
+/*
+ * Sonics Silicon Backplane
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- kernel.spec 17 Sep 2007 14:16:49 -0000 1.168
+++ kernel.spec 18 Sep 2007 14:01:35 -0000 1.169
@@ -628,10 +628,9 @@
Patch661: linux-2.6-libata-acpi-enable.patch
Patch662: linux-2.6-libata-pata-dma-disable-option.patch
Patch670: linux-2.6-ata-quirk.patch
-#Patch680: linux-2.6-wireless.patch
+Patch680: linux-2.6-wireless.patch
Patch681: linux-2.6-wireless-pending.patch
Patch690: git-wireless-dev.patch
-Patch691: linux-2.6-iwlwifi-fw-name-compat.patch
Patch700: linux-2.6-bcm43xx-pci-neuter.patch
Patch701: linux-2.6-drivers-ssb-debug-revision.patch
Patch710: linux-2.6-netdev-e1000e-01.patch
@@ -1131,13 +1130,11 @@
ApplyPatch linux-2.6-libata-pata-dma-disable-option.patch
# wireless patches headed for 2.6.23
-#ApplyPatch linux-2.6-wireless.patch
+ApplyPatch linux-2.6-wireless.patch
# wireless patches staged for 2.6.24
ApplyPatch linux-2.6-wireless-pending.patch
# Add the wireless stack updates and drivers from wireless-dev
ApplyPatch git-wireless-dev.patch
-# temp compat patch for iwlwifi firmware filenames
-ApplyPatch linux-2.6-iwlwifi-fw-name-compat.patch
# avoid bcm3xx vs bcm43xx-mac80211 PCI ID conflicts
ApplyPatch linux-2.6-bcm43xx-pci-neuter.patch
@@ -1802,6 +1799,9 @@
%changelog
+* Tue Sep 18 2007 John W. Linville <linville at redhat.com>
+- Update bits from wireless-2.6 and wireless-dev
+
* Mon Sep 17 2007 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.23-rc6-git7
linux-2.6-wireless-pending.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 linux-2.6-wireless-pending.patch
Index: linux-2.6-wireless-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless-pending.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-wireless-pending.patch 30 Aug 2007 20:27:32 -0000 1.3
+++ linux-2.6-wireless-pending.patch 18 Sep 2007 14:01:35 -0000 1.4
@@ -1,5 +1,6 @@
---- linux-2.6.22.noarch/include/net/mac80211.h.orig 2007-08-30 15:51:43.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/mac80211.h 2007-08-30 16:06:06.000000000 -0400
+diff -up linux-2.6.22.noarch/include/net/mac80211.h.orig linux-2.6.22.noarch/include/net/mac80211.h
+--- linux-2.6.22.noarch/include/net/mac80211.h.orig 2007-09-18 09:36:24.000000000 -0400
++++ linux-2.6.22.noarch/include/net/mac80211.h 2007-09-18 09:38:01.000000000 -0400
@@ -1,7 +1,9 @@
/*
- * Low-level hardware driver -- IEEE 802.11 driver (80211.o) interface
@@ -11,10 +12,49 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
-@@ -192,13 +194,19 @@ struct ieee80211_tx_control {
+@@ -71,14 +73,13 @@ struct ieee80211_channel {
+ #define IEEE80211_RATE_SUPPORTED 0x00000010
+ #define IEEE80211_RATE_OFDM 0x00000020
+ #define IEEE80211_RATE_CCK 0x00000040
+-#define IEEE80211_RATE_TURBO 0x00000080
+ #define IEEE80211_RATE_MANDATORY 0x00000100
+
+ #define IEEE80211_RATE_CCK_2 (IEEE80211_RATE_CCK | IEEE80211_RATE_PREAMBLE2)
+ #define IEEE80211_RATE_MODULATION(f) \
+ (f & (IEEE80211_RATE_CCK | IEEE80211_RATE_OFDM))
+
+-/* Low-level driver should set PREAMBLE2, OFDM, CCK, and TURBO flags.
++/* Low-level driver should set PREAMBLE2, OFDM and CCK flags.
+ * BASIC, SUPPORTED, ERP, and MANDATORY flags are set in 80211.o based on the
+ * configuration. */
+ struct ieee80211_rate {
+@@ -99,12 +100,10 @@ struct ieee80211_rate {
+
+ /* 802.11g is backwards-compatible with 802.11b, so a wlan card can
+ * actually be both in 11b and 11g modes at the same time. */
+-enum {
++enum ieee80211_phymode {
+ MODE_IEEE80211A, /* IEEE 802.11a */
+ MODE_IEEE80211B, /* IEEE 802.11b only */
+- MODE_ATHEROS_TURBO, /* Atheros Turbo mode (2x.11a at 5 GHz) */
+ MODE_IEEE80211G, /* IEEE 802.11g (and 802.11b compatibility) */
+- MODE_ATHEROS_TURBOG, /* Atheros Turbo mode (2x.11g at 2.4 GHz) */
+
+ /* keep last */
+ NUM_IEEE80211_MODES
+@@ -165,7 +164,6 @@ struct ieee80211_low_level_stats {
+ /* Transmit control fields. This data structure is passed to low-level driver
+ * with each TX frame. The low-level driver is responsible for configuring
+ * the hardware to use given values (depending on what is supported). */
+-#define HW_KEY_IDX_INVALID -1
+
+ struct ieee80211_tx_control {
+ int tx_rate; /* Transmit rate, given as the hw specific value for the
+@@ -191,17 +189,21 @@ struct ieee80211_tx_control {
+ #define IEEE80211_TXCTL_REQUEUE (1<<7)
#define IEEE80211_TXCTL_FIRST_FRAGMENT (1<<8) /* this is a first fragment of
* the frame */
- #define IEEE80211_TXCTL_TKIP_NEW_PHASE1_KEY (1<<9)
+-#define IEEE80211_TXCTL_TKIP_NEW_PHASE1_KEY (1<<9)
+#define IEEE80211_TXCTL_LONG_RETRY_LIMIT (1<<10) /* this frame should be send
+ * using the through
+ * set_retry_limit configured
@@ -22,6 +62,8 @@
u32 flags; /* tx control flags defined
* above */
- u8 retry_limit; /* 1 = only first attempt, 2 = one retry, .. */
++ u8 key_idx; /* keyidx from hw->set_key(), undefined if
++ * IEEE80211_TXCTL_DO_NOT_ENCRYPT is set */
+ u8 retry_limit; /* 1 = only first attempt, 2 = one retry, ..
+ * This could be used when set_retry_limit
+ * is not implemented by the driver */
@@ -29,12 +71,78 @@
u8 antenna_sel_tx; /* 0 = default/diversity, 1 = Ant0, 2 = Ant1 */
- s8 key_idx; /* -1 = do not encrypt, >= 0 keyidx from
- * hw->set_key() */
-+ s8 key_idx; /* HW_KEY_IDX_INVALID = do not encrypt,
-+ * other values: keyidx from hw->set_key() */
u8 icv_len; /* length of the ICV/MIC field in octets */
u8 iv_len; /* length of the IV field in octets */
- u8 tkip_key[16]; /* generated phase2/phase1 key for hw TKIP */
-@@ -288,28 +296,10 @@ struct ieee80211_conf {
+- u8 tkip_key[16]; /* generated phase2/phase1 key for hw TKIP */
+ u8 queue; /* hardware queue to use for this frame;
+ * 0 = highest, hw->queues-1 = lowest */
+ u8 sw_retry_attempt; /* number of times hw has tried to
+@@ -219,22 +221,56 @@ struct ieee80211_tx_control {
+ int ifindex; /* internal */
+ };
+
+-/* Receive status. The low-level driver should provide this information
+- * (the subset supported by hardware) to the 802.11 code with each received
+- * frame. */
++
++/**
++ * enum mac80211_rx_flags - receive flags
++ *
++ * These flags are used with the @flag member of &struct ieee80211_rx_status.
++ * @RX_FLAG_MMIC_ERROR: Michael MIC error was reported on this frame.
++ * Use together with %RX_FLAG_MMIC_STRIPPED.
++ * @RX_FLAG_DECRYPTED: This frame was decrypted in hardware.
++ * @RX_FLAG_RADIOTAP: This frame starts with a radiotap header.
++ * @RX_FLAG_MMIC_STRIPPED: the Michael MIC is stripped off this frame,
++ * verification has been done by the hardware.
++ * @RX_FLAG_IV_STRIPPED: The IV/ICV are stripped from this frame.
++ * If this flag is set, the stack cannot do any replay detection
++ * hence the driver or hardware will have to do that.
++ */
++enum mac80211_rx_flags {
++ RX_FLAG_MMIC_ERROR = 1<<0,
++ RX_FLAG_DECRYPTED = 1<<1,
++ RX_FLAG_RADIOTAP = 1<<2,
++ RX_FLAG_MMIC_STRIPPED = 1<<3,
++ RX_FLAG_IV_STRIPPED = 1<<4,
++};
++
++/**
++ * struct ieee80211_rx_status - receive status
++ *
++ * The low-level driver should provide this information (the subset
++ * supported by hardware) to the 802.11 code with each received
++ * frame.
++ * @mactime: MAC timestamp as defined by 802.11
++ * @freq: frequency the radio was tuned to when receiving this frame, in MHz
++ * @channel: channel the radio was tuned to
++ * @phymode: active PHY mode
++ * @ssi: signal strength when receiving this frame
++ * @signal: used as 'qual' in statistics reporting
++ * @noise: PHY noise when receiving this frame
++ * @antenna: antenna used
++ * @rate: data rate
++ * @flag: %RX_FLAG_*
++ */
+ struct ieee80211_rx_status {
+ u64 mactime;
+- int freq; /* receive frequency in Mhz */
++ int freq;
+ int channel;
+ int phymode;
+ int ssi;
+- int signal; /* used as qual in statistics reporting */
++ int signal;
+ int noise;
+ int antenna;
+ int rate;
+-#define RX_FLAG_MMIC_ERROR (1<<0)
+-#define RX_FLAG_DECRYPTED (1<<1)
+-#define RX_FLAG_RADIOTAP (1<<2)
+ int flag;
+ };
+
+@@ -288,28 +324,10 @@ struct ieee80211_conf {
u8 power_level; /* transmit power limit for current
* regulatory domain; in dBm */
u8 antenna_max; /* maximum antenna gain */
@@ -63,39 +171,69 @@
};
/**
-@@ -402,29 +392,41 @@ struct ieee80211_if_conf {
+@@ -402,40 +420,86 @@ struct ieee80211_if_conf {
struct ieee80211_tx_control *beacon_control;
};
-typedef enum { ALG_NONE, ALG_WEP, ALG_TKIP, ALG_CCMP, ALG_NULL }
-ieee80211_key_alg;
-+typedef enum {
++/**
++ * enum ieee80211_key_alg - key algorithm
++ * @ALG_NONE: Unset key algorithm, will never be passed to the driver
++ * @ALG_WEP: WEP40 or WEP104
++ * @ALG_TKIP: TKIP
++ * @ALG_CCMP: CCMP (AES)
++ */
++typedef enum ieee80211_key_alg {
+ ALG_NONE,
+ ALG_WEP,
+ ALG_TKIP,
+ ALG_CCMP,
+} ieee80211_key_alg;
-+/*
-+ * This flag indiciates that the station this key is being
-+ * configured for may use QoS. If your hardware cannot handle
-+ * that situation it should reject that key.
-+ */
-+#define IEEE80211_KEY_FLAG_WMM_STA (1<<0)
- struct ieee80211_key_conf {
-+ /*
-+ * To be set by the driver to the key index it would like to
-+ * get in the ieee80211_tx_control.key_idx which defaults
-+ * to HW_KEY_IDX_INVALID so that shouldn't be used.
-+ */
[...4086 lines suppressed...]
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/tx.c.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/tx.c
--- linux-2.6.22.noarch/drivers/net/wireless/libertas/tx.c.orig 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/tx.c 2007-08-30 16:06:06.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/tx.c 2007-09-18 09:37:00.000000000 -0400
@@ -58,7 +58,6 @@ static u32 convert_radiotap_rate_to_mv(u
*/
static int SendSinglePacket(wlan_private * priv, struct sk_buff *skb)
@@ -24651,8 +25194,9 @@
}
}
EXPORT_SYMBOL_GPL(libertas_send_tx_feedback);
---- /dev/null 2007-08-30 08:15:33.553140766 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/if_cs.c 2007-08-30 16:06:06.000000000 -0400
+diff -up /dev/null linux-2.6.22.noarch/drivers/net/wireless/libertas/if_cs.c
+--- /dev/null 2007-09-18 08:44:28.563724362 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/if_cs.c 2007-09-18 09:37:00.000000000 -0400
@@ -0,0 +1,961 @@
+/*
+
@@ -25615,8 +26159,9 @@
+
+module_init(if_cs_init);
+module_exit(if_cs_exit);
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/thread.h.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/thread.h
--- linux-2.6.22.noarch/drivers/net/wireless/libertas/thread.h.orig 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/thread.h 2007-08-30 16:07:03.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/thread.h 2007-09-18 09:37:00.000000000 -0400
@@ -1,52 +0,0 @@
-#ifndef __WLAN_THREAD_H_
-#define __WLAN_THREAD_H_
@@ -25670,8 +26215,9 @@
-}
-
-#endif
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.h.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.h
--- linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.h.orig 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.h 2007-08-30 16:06:06.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/if_usb.h 2007-09-18 09:37:00.000000000 -0400
@@ -38,7 +38,7 @@ struct bootcmdrespStr
/* read callback private data */
@@ -25706,8 +26252,9 @@
-int if_usb_issue_boot_command(wlan_private *priv, int ivalue);
-
#endif
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/ethtool.c.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/ethtool.c
--- linux-2.6.22.noarch/drivers/net/wireless/libertas/ethtool.c.orig 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/ethtool.c 2007-08-30 16:06:06.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/ethtool.c 2007-09-18 09:37:00.000000000 -0400
@@ -60,8 +60,7 @@ static int libertas_ethtool_get_eeprom(s
// mutex_lock(&priv->mutex);
@@ -25741,8 +26288,9 @@
if (ret) {
ret = 0;
+diff -up linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h.orig linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h
--- linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h.orig 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h 2007-08-30 16:06:06.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h 2007-09-18 09:37:00.000000000 -0400
@@ -15,14 +15,9 @@ struct wlan_private;
struct sk_buff;
struct net_device;
@@ -25799,8 +26347,9 @@
+int libertas_reset_device(wlan_private *priv);
#endif /* _WLAN_DECL_H_ */
---- linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h.orig 2007-08-30 15:51:39.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h 2007-08-30 16:06:06.000000000 -0400
+diff -up linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h.orig linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h
+--- linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h.orig 2007-09-18 09:36:19.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h 2007-09-18 09:37:00.000000000 -0400
@@ -67,6 +67,7 @@ struct rtl8187_priv {
struct rtl818x_csr *map;
void (*rf_init)(struct ieee80211_hw *);
@@ -25809,8 +26358,9 @@
/* rtl8187 specific */
struct ieee80211_channel channels[14];
---- linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig 2007-08-30 15:51:39.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c 2007-08-30 16:06:06.000000000 -0400
+diff -up linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c
+--- linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig 2007-09-18 09:36:19.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c 2007-09-18 09:37:00.000000000 -0400
@@ -1753,7 +1753,7 @@ prism54_get_oid(struct net_device *ndev,
int rvalue;
enum oid_num_t n = dwrq->flags;
@@ -25838,8 +26388,9 @@
}
void
+diff -up linux-2.6.22.noarch/drivers/net/wireless/prism54/oid_mgt.c.orig linux-2.6.22.noarch/drivers/net/wireless/prism54/oid_mgt.c
--- linux-2.6.22.noarch/drivers/net/wireless/prism54/oid_mgt.c.orig 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/prism54/oid_mgt.c 2007-08-30 16:06:06.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/prism54/oid_mgt.c 2007-09-18 09:37:00.000000000 -0400
@@ -244,13 +244,11 @@ mgt_init(islpci_private *priv)
/* Alloc the cache */
for (i = 0; i < OID_NUM_LAST; i++) {
@@ -25855,8 +26406,9 @@
} else
priv->mib[i] = NULL;
}
---- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig 2007-08-30 15:51:39.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig 2007-08-30 16:06:05.000000000 -0400
+diff -up linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig linux-2.6.22.noarch/drivers/net/wireless/Kconfig
+--- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig 2007-09-18 09:36:19.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig 2007-09-18 09:37:00.000000000 -0400
@@ -63,11 +63,6 @@ config WAVELAN
a Radio LAN (wireless Ethernet-like Local Area Network) using the
radio frequencies 900 MHz and 2.4 GHz.
@@ -25991,8 +26543,9 @@
config PCMCIA_WL3501
tristate "Planet WL3501 PCMCIA cards"
depends on EXPERIMENTAL && PCMCIA && WLAN_80211
---- linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c.orig 2007-08-30 15:51:39.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c 2007-08-30 16:06:06.000000000 -0400
+diff -up linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c.orig linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c
+--- linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c.orig 2007-09-18 09:36:19.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c 2007-09-18 09:37:00.000000000 -0400
@@ -859,7 +859,7 @@ static int wl3501_esbq_confirm(struct wl
static void wl3501_online(struct net_device *dev)
@@ -26297,8 +26850,30 @@
if (link->open) {
wl3501_reset(dev);
netif_device_attach(dev);
+diff -up linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c.orig linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+--- linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c.orig 2007-09-18 09:36:26.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c 2007-09-18 09:40:20.000000000 -0400
+@@ -2380,7 +2380,7 @@ static int bcm43xx_chip_init(struct bcm4
+ goto err_gpio_cleanup;
+ bcm43xx_radio_turn_on(bcm);
+ bcm->radio_hw_enable = bcm43xx_is_hw_radio_enabled(bcm);
+- dprintk(KERN_INFO PFX "Radio %s by hardware\n",
++ printk(KERN_INFO PFX "Radio %s by hardware\n",
+ (bcm->radio_hw_enable == 0) ? "disabled" : "enabled");
+
+ bcm43xx_write16(bcm, 0x03E6, 0x0000);
+@@ -3129,7 +3129,7 @@ static void bcm43xx_periodic_every1sec(s
+ radio_hw_enable = bcm43xx_is_hw_radio_enabled(bcm);
+ if (unlikely(bcm->radio_hw_enable != radio_hw_enable)) {
+ bcm->radio_hw_enable = radio_hw_enable;
+- dprintk(KERN_INFO PFX "Radio hardware status changed to %s\n",
++ printk(KERN_INFO PFX "Radio hardware status changed to %s\n",
+ (radio_hw_enable == 0) ? "disabled" : "enabled");
+ bcm43xx_leds_update(bcm, 0);
+ }
+diff -up linux-2.6.22.noarch/drivers/net/wireless/arlan-proc.c.orig linux-2.6.22.noarch/drivers/net/wireless/arlan-proc.c
--- linux-2.6.22.noarch/drivers/net/wireless/arlan-proc.c.orig 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/arlan-proc.c 2007-08-30 16:06:05.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/arlan-proc.c 2007-09-18 09:37:00.000000000 -0400
@@ -435,7 +435,7 @@ static int arlan_sysctl_info(ctl_table *
goto final;
}
@@ -26362,8 +26937,9 @@
arlan_command(arlan_device[devnum], ARLAN_COMMAND_CLEAN_AND_RESET);
} else
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_wlan.h.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_wlan.h
--- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_wlan.h.orig 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_wlan.h 2007-08-30 16:06:05.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_wlan.h 2007-09-18 09:37:00.000000000 -0400
@@ -3,6 +3,7 @@
#include <linux/wireless.h>
@@ -26381,8 +26957,9 @@
u16 infofid; /* MAC buffer id for info frame */
/* txfid, intransmitfid, next_txtid, and next_alloc are protected by
* txfidlock */
---- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig 2007-08-30 15:51:39.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c 2007-08-30 16:06:05.000000000 -0400
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c
+--- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig 2007-09-18 09:36:19.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c 2007-09-18 09:37:00.000000000 -0400
@@ -272,7 +272,7 @@ static int sandisk_enable_wireless(struc
{
int res, ret = 0;
@@ -26392,8 +26969,9 @@
local_info_t *local = iface->local;
tuple_t tuple;
cisparse_t *parse = NULL;
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_hw.c
--- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_hw.c 2007-08-30 16:06:05.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_hw.c 2007-09-18 09:37:00.000000000 -0400
@@ -825,7 +825,7 @@ static int hfa384x_get_rid(struct net_de
local->hw_downloading)
return -ENODEV;
@@ -26463,8 +27041,9 @@
local = iface->local;
/* Send disconnect event, e.g., to trigger reassociation after resume
---- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig 2007-08-30 15:51:39.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c 2007-08-30 16:06:05.000000000 -0400
+diff -up linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c
+--- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig 2007-09-18 09:36:19.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c 2007-09-18 09:37:00.000000000 -0400
@@ -3088,7 +3088,7 @@ static int prism2_ioctl_priv_download(lo
static int prism2_set_genericelement(struct net_device *dev, u8 *elem,
size_t len)
--- linux-2.6-iwlwifi-fw-name-compat.patch DELETED ---
- Previous message (by thread): rpms/eclipse-subclipse/F-7 subclipse-fetch-1.2.4.sh, NONE, 1.1 .cvsignore, 1.5, 1.6 eclipse-subclipse-1.2.2-plugin-classpath.patch, 1.1, 1.2 eclipse-subclipse.spec, 1.5, 1.6 sources, 1.5, 1.6 subclipse-fetch-1.2.2.sh, 1.1, NONE
- Next message (by thread): rpms/perl-DateTime/devel .cvsignore, 1.16, 1.17 perl-DateTime.spec, 1.20, 1.21 sources, 1.16, 1.17
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list