rpms/kernel/F-7 linux-2.6-rndis_wext.patch, NONE, 1.1 kernel-2.6.spec, 1.3419, 1.3420 linux-2.6-wireless-pending.patch, 1.13, 1.14 linux-2.6-wireless.patch, 1.23, 1.24 linux-2.6-ath5k.patch, 1.12, NONE linux-2.6-rtl8180.patch, 1.5, NONE linux-2.6-wireless-pending-too.patch, 1.3, NONE
John W. Linville (linville)
fedora-extras-commits at redhat.com
Wed Jan 23 21:42:43 UTC 2008
Author: linville
Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23229
Modified Files:
kernel-2.6.spec linux-2.6-wireless-pending.patch
linux-2.6-wireless.patch
Added Files:
linux-2.6-rndis_wext.patch
Removed Files:
linux-2.6-ath5k.patch linux-2.6-rtl8180.patch
linux-2.6-wireless-pending-too.patch
Log Message:
Latest wireless updates from upstream ; Remove obsolete ath5k and rtl8180 patches ; Add rndis_wext driver
linux-2.6-rndis_wext.patch:
--- NEW FILE linux-2.6-rndis_wext.patch ---
diff -up /dev/null linux-2.6.23.noarch/include/linux/usb/usbnet.h
--- /dev/null 2008-01-23 09:33:30.193134867 -0500
+++ linux-2.6.23.noarch/include/linux/usb/usbnet.h 2008-01-23 16:06:09.000000000 -0500
@@ -0,0 +1,211 @@
+/*
+ * USB Networking Link Interface
+ *
+ * Copyright (C) 2000-2005 by David Brownell <dbrownell at users.sourceforge.net>
+ * Copyright (C) 2003-2005 David Hollis <dhollis at davehollis.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+
+#ifndef __USBNET_H
+#define __USBNET_H
+
+
+/* interface from usbnet core to each USB networking link we handle */
+struct usbnet {
+ /* housekeeping */
+ struct usb_device *udev;
+ struct usb_interface *intf;
+ struct driver_info *driver_info;
+ const char *driver_name;
+ void *driver_priv;
+ wait_queue_head_t *wait;
+ struct mutex phy_mutex;
+ unsigned char suspend_count;
+
+ /* i/o info: pipes etc */
+ unsigned in, out;
+ struct usb_host_endpoint *status;
+ unsigned maxpacket;
+ struct timer_list delay;
+
+ /* protocol/interface state */
+ struct net_device *net;
+ struct net_device_stats stats;
+ int msg_enable;
+ unsigned long data [5];
+ u32 xid;
+ u32 hard_mtu; /* count any extra framing */
+ size_t rx_urb_size; /* size for rx urbs */
+ struct mii_if_info mii;
+
+ /* various kinds of pending driver work */
+ struct sk_buff_head rxq;
+ struct sk_buff_head txq;
+ struct sk_buff_head done;
+ struct urb *interrupt;
+ struct tasklet_struct bh;
+
+ struct work_struct kevent;
+ unsigned long flags;
+# define EVENT_TX_HALT 0
+# define EVENT_RX_HALT 1
+# define EVENT_RX_MEMORY 2
+# define EVENT_STS_SPLIT 3
+# define EVENT_LINK_RESET 4
+};
+
+static inline struct usb_driver *driver_of(struct usb_interface *intf)
+{
+ return to_usb_driver(intf->dev.driver);
+}
+
+/* interface from the device/framing level "minidriver" to core */
+struct driver_info {
+ char *description;
+
+ int flags;
+/* framing is CDC Ethernet, not writing ZLPs (hw issues), or optionally: */
+#define FLAG_FRAMING_NC 0x0001 /* guard against device dropouts */
+#define FLAG_FRAMING_GL 0x0002 /* genelink batches packets */
+#define FLAG_FRAMING_Z 0x0004 /* zaurus adds a trailer */
+#define FLAG_FRAMING_RN 0x0008 /* RNDIS batches, plus huge header */
+
+#define FLAG_NO_SETINT 0x0010 /* device can't set_interface() */
+#define FLAG_ETHER 0x0020 /* maybe use "eth%d" names */
+
+#define FLAG_FRAMING_AX 0x0040 /* AX88772/178 packets */
+#define FLAG_WLAN 0x0080 /* use "wlan%d" names */
+
+
+ /* init device ... can sleep, or cause probe() failure */
+ int (*bind)(struct usbnet *, struct usb_interface *);
+
+ /* cleanup device ... can sleep, but can't fail */
+ void (*unbind)(struct usbnet *, struct usb_interface *);
+
+ /* reset device ... can sleep */
+ int (*reset)(struct usbnet *);
+
+ /* see if peer is connected ... can sleep */
+ int (*check_connect)(struct usbnet *);
+
+ /* for status polling */
+ void (*status)(struct usbnet *, struct urb *);
+
+ /* link reset handling, called from defer_kevent */
+ int (*link_reset)(struct usbnet *);
+
+ /* fixup rx packet (strip framing) */
+ int (*rx_fixup)(struct usbnet *dev, struct sk_buff *skb);
+
+ /* fixup tx packet (add framing) */
+ struct sk_buff *(*tx_fixup)(struct usbnet *dev,
+ struct sk_buff *skb, gfp_t flags);
+
+ /* rndis minidriver early initialization code, can sleep */
+ int (*rndis_early_init)(struct usbnet *dev);
+
+ /* called when link state changes, state: 0=disconnect, 1=connect */
+ void (*rndis_link_change)(struct usbnet *dev, int state);
+
+ /* for new devices, use the descriptor-reading code instead */
+ int in; /* rx endpoint */
+ int out; /* tx endpoint */
+
+ unsigned long data; /* Misc driver specific data */
+};
+
+/* Minidrivers are just drivers using the "usbnet" core as a powerful
+ * network-specific subroutine library ... that happens to do pretty
+ * much everything except custom framing and chip-specific stuff.
+ */
+extern int usbnet_probe(struct usb_interface *, const struct usb_device_id *);
+extern int usbnet_suspend (struct usb_interface *, pm_message_t );
+extern int usbnet_resume (struct usb_interface *);
+extern void usbnet_disconnect(struct usb_interface *);
+
+
+/* Drivers that reuse some of the standard USB CDC infrastructure
+ * (notably, using multiple interfaces according to the CDC
+ * union descriptor) get some helper code.
+ */
+struct cdc_state {
+ struct usb_cdc_header_desc *header;
+ struct usb_cdc_union_desc *u;
+ struct usb_cdc_ether_desc *ether;
+ struct usb_interface *control;
+ struct usb_interface *data;
+};
+
+extern int usbnet_generic_cdc_bind (struct usbnet *, struct usb_interface *);
+extern void usbnet_cdc_unbind (struct usbnet *, struct usb_interface *);
+
+/* CDC and RNDIS support the same host-chosen packet filters for IN transfers */
+#define DEFAULT_FILTER (USB_CDC_PACKET_TYPE_BROADCAST \
+ |USB_CDC_PACKET_TYPE_ALL_MULTICAST \
+ |USB_CDC_PACKET_TYPE_PROMISCUOUS \
+ |USB_CDC_PACKET_TYPE_DIRECTED)
+
+
+/* we record the state for each of our queued skbs */
+enum skb_state {
+ illegal = 0,
+ tx_start, tx_done,
+ rx_start, rx_done, rx_cleanup
+};
+
+struct skb_data { /* skb->cb is one of these */
+ struct urb *urb;
+ struct usbnet *dev;
+ enum skb_state state;
+ size_t length;
+};
+
+
+extern int usbnet_get_endpoints(struct usbnet *, struct usb_interface *);
+extern void usbnet_defer_kevent (struct usbnet *, int);
+extern void usbnet_skb_return (struct usbnet *, struct sk_buff *);
+extern void usbnet_unlink_rx_urbs(struct usbnet *);
+
+extern int usbnet_get_settings (struct net_device *net, struct ethtool_cmd *cmd);
+extern int usbnet_set_settings (struct net_device *net, struct ethtool_cmd *cmd);
+extern u32 usbnet_get_link (struct net_device *net);
+extern u32 usbnet_get_msglevel (struct net_device *);
+extern void usbnet_set_msglevel (struct net_device *, u32);
+extern void usbnet_get_drvinfo (struct net_device *, struct ethtool_drvinfo *);
+extern int usbnet_nway_reset(struct net_device *net);
+
+/* messaging support includes the interface name, so it must not be
+ * used before it has one ... notably, in minidriver bind() calls.
+ */
+#ifdef DEBUG
[...3618 lines suppressed...]
+ destroy_workqueue(priv->workqueue);
+
+ if (priv && priv->wpa_ie_len)
+ kfree(priv->wpa_ie);
+ kfree(priv);
+
+ rndis_unbind(dev, intf);
+}
+
+
+static int rndis_wext_reset(struct usbnet *dev)
+{
+ return deauthenticate(dev);
+}
+
+
+static const struct driver_info bcm4320_info = {
+ .description = "Wireless RNDIS device, BCM4320 based",
+ .flags = FLAG_WLAN | FLAG_FRAMING_RN | FLAG_NO_SETINT,
+ .bind = rndis_wext_bind,
+ .unbind = rndis_wext_unbind,
+ .status = rndis_status,
+ .rx_fixup = rndis_rx_fixup,
+ .tx_fixup = rndis_tx_fixup,
+ .reset = rndis_wext_reset,
+ .rndis_early_init = bcm4320_early_init,
+ .rndis_link_change = rndis_wext_link_change,
+};
+
+/*-------------------------------------------------------------------------*/
+
+static const struct usb_device_id products [] = {
+#define RNDIS_MASTER_INTERFACE \
+ .bInterfaceClass = USB_CLASS_COMM, \
+ .bInterfaceSubClass = 2 /* ACM */, \
+ .bInterfaceProtocol = 0x0ff
+
+/* When adding new entries, remember to add blacklist entry to rndis_host. */
+
+/* INF driver for these devices have DriverVer >= 4.xx.xx.xx and many custom
+ * parameters available. Chipset marked as 'BCM4320SKFBG' in NDISwrapper-wiki.
+ */
+{
+ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
+ | USB_DEVICE_ID_MATCH_DEVICE,
+ .idVendor = 0x0411,
+ .idProduct = 0x00bc, /* Buffalo WLI-U2-KG125S */
+ RNDIS_MASTER_INTERFACE,
+ .driver_info = (unsigned long) &bcm4320_info,
+}, {
+ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
+ | USB_DEVICE_ID_MATCH_DEVICE,
+ .idVendor = 0x0baf,
+ .idProduct = 0x011b, /* U.S. Robotics USR5421 */
+ RNDIS_MASTER_INTERFACE,
+ .driver_info = (unsigned long) &bcm4320_info,
+}, {
+ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
+ | USB_DEVICE_ID_MATCH_DEVICE,
+ .idVendor = 0x050d,
+ .idProduct = 0x011b, /* Belkin F5D7051 */
+ RNDIS_MASTER_INTERFACE,
+ .driver_info = (unsigned long) &bcm4320_info,
+}, {
+ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
+ | USB_DEVICE_ID_MATCH_DEVICE,
+ .idVendor = 0x1799, /* Belkin has two vendor ids */
+ .idProduct = 0x011b, /* Belkin F5D7051 */
+ RNDIS_MASTER_INTERFACE,
+ .driver_info = (unsigned long) &bcm4320_info,
+}, {
+ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
+ | USB_DEVICE_ID_MATCH_DEVICE,
+ .idVendor = 0x13b1,
+ .idProduct = 0x0014, /* Linksys WUSB54GSv2 */
+ RNDIS_MASTER_INTERFACE,
+ .driver_info = (unsigned long) &bcm4320_info,
+}, {
+ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
+ | USB_DEVICE_ID_MATCH_DEVICE,
+ .idVendor = 0x13b1,
+ .idProduct = 0x0026, /* Linksys WUSB54GSC */
+ RNDIS_MASTER_INTERFACE,
+ .driver_info = (unsigned long) &bcm4320_info,
+}, {
+ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
+ | USB_DEVICE_ID_MATCH_DEVICE,
+ .idVendor = 0x0b05,
+ .idProduct = 0x1717, /* Asus WL169gE */
+ RNDIS_MASTER_INTERFACE,
+ .driver_info = (unsigned long) &bcm4320_info,
+}, {
+ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
+ | USB_DEVICE_ID_MATCH_DEVICE,
+ .idVendor = 0x0a5c,
+ .idProduct = 0xd11b, /* Eminent EM4045 */
+ RNDIS_MASTER_INTERFACE,
+ .driver_info = (unsigned long) &bcm4320_info,
+}, {
+ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
+ | USB_DEVICE_ID_MATCH_DEVICE,
+ .idVendor = 0x1690,
+ .idProduct = 0x0715, /* BT Voyager 1055 */
+ RNDIS_MASTER_INTERFACE,
+ .driver_info = (unsigned long) &bcm4320_info,
+},
+/* These devices have DriverVer < 4.xx.xx.xx and do not have any custom
+ * parameters available, hardware probably contain older firmware version with
+ * no way of updating. Chipset marked as 'BCM4320????' in NDISwrapper-wiki.
+ */
+{
+ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
+ | USB_DEVICE_ID_MATCH_DEVICE,
+ .idVendor = 0x13b1,
+ .idProduct = 0x000e, /* Linksys WUSB54GSv1 */
+ RNDIS_MASTER_INTERFACE,
+ .driver_info = (unsigned long) &bcm4320_info,
+}, {
+ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
+ | USB_DEVICE_ID_MATCH_DEVICE,
+ .idVendor = 0x0baf,
+ .idProduct = 0x0111, /* U.S. Robotics USR5420 */
+ RNDIS_MASTER_INTERFACE,
+ .driver_info = (unsigned long) &bcm4320_info,
+}, {
+ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
+ | USB_DEVICE_ID_MATCH_DEVICE,
+ .idVendor = 0x0411,
+ .idProduct = 0x004b, /* BUFFALO WLI-USB-G54 */
+ RNDIS_MASTER_INTERFACE,
+ .driver_info = (unsigned long) &bcm4320_info,
+},
+ { }, // END
+};
+MODULE_DEVICE_TABLE(usb, products);
+
+static struct usb_driver rndis_wext_driver = {
+ .name = "rndis_wext",
+ .id_table = products,
+ .probe = usbnet_probe,
+ .disconnect = usbnet_disconnect,
+ .suspend = usbnet_suspend,
+ .resume = usbnet_resume,
+};
+
+static int __init rndis_wext_init(void)
+{
+ return usb_register(&rndis_wext_driver);
+}
+module_init(rndis_wext_init);
+
+static void __exit rndis_wext_exit(void)
+{
+ usb_deregister(&rndis_wext_driver);
+}
+module_exit(rndis_wext_exit);
+
+MODULE_AUTHOR("Bjorge Dijkstra");
+MODULE_AUTHOR("Jussi Kivilinna");
+MODULE_DESCRIPTION("Driver for RNDIS based USB Wireless adapters");
+MODULE_LICENSE("GPL");
+
diff -up linux-2.6.23.noarch/drivers/net/wireless/Kconfig.orig linux-2.6.23.noarch/drivers/net/wireless/Kconfig
--- linux-2.6.23.noarch/drivers/net/wireless/Kconfig.orig 2008-01-23 16:02:05.000000000 -0500
+++ linux-2.6.23.noarch/drivers/net/wireless/Kconfig 2008-01-23 16:06:20.000000000 -0500
@@ -603,6 +603,34 @@ config RTL8180
Thanks to Realtek for their support!
+config USB_NET_RNDIS_WEXT
+ tristate "Wireless RNDIS USB support"
+ depends on USB && WLAN_80211 && EXPERIMENTAL
+ select USB_USBNET
+ select USB_NET_CDCETHER
+ select USB_NET_RNDIS_HOST
+ select WIRELESS_EXT
+ ---help---
+ This is a driver for wireless RNDIS devices.
+ These are USB based adapters found in devices such as:
+
+ Buffalo WLI-U2-KG125S
+ U.S. Robotics USR5421
+ Belkin F5D7051
+ Linksys WUSB54GSv2
+ Linksys WUSB54GSC
+ Asus WL169gE
+ Eminent EM4045
+ BT Voyager 1055
+ Linksys WUSB54GSv1
+ U.S. Robotics USR5420
+ BUFFALO WLI-USB-G54
+
+ All of these devices are based on Broadcom 4320 chip which is the
+ only wireless RNDIS chip known to date.
+
+ If you choose to build a module, it'll be called rndis_wext.
+
config RTL8187
tristate "Realtek 8187 USB support"
depends on MAC80211 && USB && WLAN_80211 && EXPERIMENTAL
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3419
retrieving revision 1.3420
diff -u -r1.3419 -r1.3420
--- kernel-2.6.spec 23 Jan 2008 00:31:21 -0000 1.3419
+++ kernel-2.6.spec 23 Jan 2008 21:41:07 -0000 1.3420
@@ -606,10 +606,8 @@
Patch680: linux-2.6-wireless.patch
Patch681: linux-2.6-wireless-pending.patch
-Patch682: linux-2.6-wireless-pending-too.patch
Patch690: linux-2.6-at76.patch
-Patch691: linux-2.6-ath5k.patch
-Patch692: linux-2.6-rtl8180.patch
+Patch691: linux-2.6-rndis_wext.patch
Patch700: linux-2.6-bcm43xx-pci-neuter.patch
Patch701: linux-2.6-zd1211rw-module-alias.patch
Patch702: linux-2.6-b43-module-alias.patch
@@ -1318,8 +1316,7 @@
# Add misc wireless bits from upstream wireless tree
ApplyPatch linux-2.6-at76.patch
-ApplyPatch linux-2.6-ath5k.patch
-ApplyPatch linux-2.6-rtl8180.patch
+ApplyPatch linux-2.6-rndis_wext.patch
# avoid bcm3xx vs bcm43xx-mac80211 PCI ID conflicts
ApplyPatch linux-2.6-bcm43xx-pci-neuter.patch
@@ -1330,9 +1327,6 @@
# Make ath5k use software WEP
ApplyPatch linux-2.6-ath5k-use-soft-wep.patch
-# Some more 2.6.25 stuff, here due to upstream process anomalies...
-ApplyPatch linux-2.6-wireless-pending-too.patch
-
# e1000e goes here
# latest Intel driver for ich9
ApplyPatch linux-2.6-netdev-e1000e-01.patch
@@ -2324,6 +2318,11 @@
%endif
%changelog
+* Wed Jan 23 2008 John W. Linville <linville at redhat.com> 2.6.23.14-69
+- Latest wireless updates from upstream
+- Remove obsolete ath5k and rtl8180 patches
+- Add rndis_wext driver
+
* Tue Jan 22 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.23.14-68
- Fix futex oops on uniprocessor machine. (F8#429412)
linux-2.6-wireless-pending.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.13 -r 1.14 linux-2.6-wireless-pending.patch
Index: linux-2.6-wireless-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-wireless-pending.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- linux-2.6-wireless-pending.patch 17 Jan 2008 21:36:37 -0000 1.13
+++ linux-2.6-wireless-pending.patch 23 Jan 2008 21:41:07 -0000 1.14
@@ -1,3 +1,1033 @@
+commit 9fa8e14e585485cec9b2dfbee2c0922bac0841dd
+Author: Bruno Randolf <bruno at thinktube.com>
+Date: Mon Jan 21 11:09:46 2008 +0900
+
+ ath5k: always extend rx timestamp with tsf
+
+ always extend the rx timestamp with the local TSF, since this information is
+ also needed for proper IBSS merging. this is done in the tasklet for now, maybe
+ has to be moved to the interrupt handler like in madwifi.
+
+ drivers/net/wireless/ath5k/base.c: Changes-licensed-under: 3-Clause-BSD
+
+ Signed-off-by: Bruno Randolf <bruno at thinktube.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 584396cce428867706cd07f038815982df011576
+Author: Bruno Randolf <bruno at thinktube.com>
+Date: Sat Jan 19 18:18:41 2008 +0900
+
+ ath5k: configure backoff for IBSS beacon queue
+
+ in "11.1.2.2 Beacon generation in an IBSS" the IEEE802.11 standard says, each
+ STA should... "b) Calculate a random delay uniformly distributed in the range
+ between zero and twice aCWmin à aSlotTime,".
+
+ configure cwmin and cwmax of the beacon queue in IBSS mode according to this.
+ unfortunately beacon backoff does not work reliably yet, so i suspect we have a
+ problem somewhere else, since the same settings (and similar beacon timer
+ configuration) work for madwifi.
+
+ drivers/net/wireless/ath5k/base.c: Changes-licensed-under: 3-Clause-BSD
+
+ Signed-off-by: Bruno Randolf <bruno at thinktube.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit bcee08a623fac1b1089c26476277fe339eb51e31
+Author: Bruno Randolf <bruno at thinktube.com>
+Date: Sat Jan 19 18:18:21 2008 +0900
+
+ ath5k: use SWBA to detect IBSS HW merges
+
+ use SWBA (software beacon alert) interrupts to keep track of the next beacon
+ time und check if a HW merge (automatic TSF update) has happened on every
+ received beacon with the same BSSID.
+
+ this is necessary because the atheros hardware will silently update the local
+ TSF in IBSS mode, but not its beacon timers. if the TSF is ahead of the beacon
+ timers no beacons are sent until the timers wrap around (typically after about
+ 1 minute).
+
+ this solution is not very nice, since we have to look into every beacon, but
+ there is apparently no other way to detect HW merges.
+
+ drivers/net/wireless/ath5k/base.c: Changes-licensed-under: 3-Clause-BSD
+ drivers/net/wireless/ath5k/base.h: Changes-licensed-under: 3-Clause-BSD
+
+ Signed-off-by: Bruno Randolf <bruno at thinktube.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 6dc94fc9c313cf50cdef52f4bd736382491a70ee
+Author: Bruno Randolf <bruno at thinktube.com>
+Date: Sat Jan 19 18:17:59 2008 +0900
+
+ ath5k: better beacon timer calculation
+
+ update ath5k_beacon_update_timers() for better beacon timer calculation in a
+ variety of situations. most important is the possibility to call it with the
+ timestamp of a received beacon, when we detected that a HW merge has happened
+ and we need to reconfigure the beacon timers based on that.
+
+ we call this from the mac80211 callback reset_tsf now instead of beacon_update,
+ and there will be more use of it in the next patch.
+
+ drivers/net/wireless/ath5k/base.c: Changes-licensed-under: 3-Clause-BSD
+
+ Signed-off-by: Bruno Randolf <bruno at thinktube.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit ded271e319d5c1481f3a3ae024b25f09864f34c9
+Author: Bruno Randolf <bruno at thinktube.com>
+Date: Fri Jan 18 21:51:40 2008 +0900
+
+ ath5k: beacon interval is in TU
+
+ the beacon interval is passed by mac80211 in TU already, so we can directly use
+ it without conversion. also update the comments about TU (1 TU is defined by
+ 802.11 as 1024usec).
+
+ drivers/net/wireless/ath5k/ath5k.h: Changes-licensed-under: ISC
+ drivers/net/wireless/ath5k/base.c: Changes-licensed-under: 3-Clause-BSD
+ drivers/net/wireless/ath5k/base.h: Changes-licensed-under: 3-Clause-BSD
+
+ Signed-off-by: Bruno Randolf <bruno at thinktube.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 8ea9e63cadc2c116029c87c06d4c697ba89eb5fc
+Author: Bruno Randolf <bruno at thinktube.com>
+Date: Fri Jan 18 21:51:19 2008 +0900
+
+ ath5k: use 3 instead of 0x00000003
+
+ reviewed beacon timer initialization with register traces from madwifi: what we
+ are doing is correct :). one minor fix: use 3 instead of 0x00000003 - it's more
+ readable.
+
+ drivers/net/wireless/ath5k/hw.c: Changes-licensed-under: ISC
+
+ Signed-off-by: Bruno Randolf <bruno at thinktube.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 5a4357185994d38c890f762def993105a9bbd4f7
+Author: Michael Buesch <mb at bu3sch.de>
+Date: Tue Jan 22 20:23:34 2008 +0100
+
+ b43: Fix MAC control and microcode init
+
+ This zeros out all microcode related memory before loading
+ the microcode.
+
+ This also fixes initialization of the MAC control register.
+ The _only_ place where we overwrite the contents of the MAC control
+ register is at the beginning of b43_chip_init().
+ All other places must do read() -> mask/set -> write() to not
+ overwrite existing bits.
+
+ This also adds a longer delay for waiting for the microcode
+ to initialize itself. It seems that the current timeout is sufficient
+ on all available devices, but there's no real reason why we shouldn't
+ wait for up to one second. Slow embedded devices might exist.
+ Better safe than sorry.
+
+ Signed-off-by: Michael Buesch <mb at bu3sch.de>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 980dff0323602abd34ff95e7e7c6af6360ef640f
+Author: Masakazu Mokuno <mokuno at sm.sony.co.jp>
+Date: Tue Jan 22 15:22:29 2008 +0900
+
+ WEXT: remove unused variable
+
+ As event_type_pk_size[] is not used, Remove it.
+
+ Signed-off-by: Masakazu Mokuno <mokuno at sm.sony.co.jp>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 44f85d46709f2e88b087f4b84915bb593ea2a352
+Author: John W. Linville <linville at tuxdriver.com>
+Date: Mon Jan 21 15:36:05 2008 -0500
+
+ ath5k: reset key cache after resume
+
+ Otherwise it may be impossible to connected to an open network after a
+ resume.
+
+ This is a modified version of an original patch by
+ Alex Eskin <alexeskin at yahoo.com>:
+
+ https://bugzilla.redhat.com/show_bug.cgi?id=425950#c8
+
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit b963fe03c992e9b166bce2def8b88a50eb03fe30
+Author: John W. Linville <linville at tuxdriver.com>
+Date: Mon Jan 21 15:36:04 2008 -0500
+
+ ath5k: use AR5K_KEYTABLE_SIZE when initializing key table
+
+ ...instead of using AR5K_KEYCACHE_SIZE, which would seem to be a
+ typo/thinko...
+
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 78b71609d4dc363326a963c5ec23c2b933101a12
+Author: Michael Buesch <mb at bu3sch.de>
+Date: Mon Jan 21 19:55:09 2008 +0100
+
+ b43: Fix firmware caching
+
+ We must also store the ID string (filename) for the cached firmware blobs
+ and verify that we really have the right firmware cached before using it.
+ If we don't have the right fw cached, we must free it and request the
+ correct blobs.
+
+ This fixes bandswitch on A/B/G multi-PHY devices.
+
+ Signed-off-by: Michael Buesch <mb at bu3sch.de>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 9bb4b531ab50e802c348d8857285ef07d2b610e6
+Author: Ron Rindjunsky <ron.rindjunsky at intel.com>
+Date: Mon Jan 21 12:39:12 2008 +0200
[...48610 lines suppressed...]
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_main.c 2008-01-17 14:16:34.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_main.c.orig 2008-01-23 16:29:08.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_main.c 2008-01-23 16:30:03.000000000 -0500
@@ -295,7 +295,7 @@ int hostap_tx_callback_unregister(local_
int hostap_set_word(struct net_device *dev, int rid, u16 val)
{
@@ -90200,7 +120452,7 @@
return ret;
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_info.c.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_info.c
--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_info.c.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_info.c 2008-01-17 14:16:34.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_info.c 2008-01-23 16:30:03.000000000 -0500
@@ -300,7 +300,7 @@ static void prism2_info_hostscanresults(
int i, result_size, copy_len, new_count;
struct hfa384x_hostscan_result *results, *prev;
@@ -90240,7 +120492,7 @@
PDEBUG2(DEBUG_EXTRA, " %02x", buf[i]);
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_80211.h.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_80211.h
--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_80211.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_80211.h 2008-01-17 14:16:34.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_80211.h 2008-01-23 16:30:03.000000000 -0500
@@ -5,52 +5,52 @@
#include <net/ieee80211_crypt.h>
@@ -90312,8 +120564,8 @@
* FH Params, DS Params, CF Params, IBSS Params, TIM */
u8 variable[0];
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c
---- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig 2008-01-17 14:15:48.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c 2008-01-17 14:16:34.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig 2008-01-23 16:29:08.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c 2008-01-23 16:30:03.000000000 -0500
@@ -84,7 +84,7 @@ static int prism2_get_datarates(struct n
if (len < 2)
return 0;
@@ -90578,8 +120830,8 @@
reason = cpu_to_le16(param->u.mlme.reason_code);
switch (param->u.mlme.cmd) {
diff -up linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c.orig linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c
---- linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c.orig 2008-01-17 14:15:48.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c 2008-01-17 14:16:34.000000000 -0500
+--- linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c.orig 2008-01-23 16:29:08.000000000 -0500
++++ linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c 2008-01-23 16:30:03.000000000 -0500
@@ -27,6 +27,8 @@ static const struct pci_device_id b43_pc
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4321) },
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4324) },
@@ -90590,8 +120842,8 @@
};
MODULE_DEVICE_TABLE(pci, b43_pci_bridge_tbl);
diff -up linux-2.6.23.noarch/drivers/ssb/pcmcia.c.orig linux-2.6.23.noarch/drivers/ssb/pcmcia.c
---- linux-2.6.23.noarch/drivers/ssb/pcmcia.c.orig 2008-01-17 14:15:48.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/pcmcia.c 2008-01-17 14:16:34.000000000 -0500
+--- linux-2.6.23.noarch/drivers/ssb/pcmcia.c.orig 2008-01-23 16:29:08.000000000 -0500
++++ linux-2.6.23.noarch/drivers/ssb/pcmcia.c 2008-01-23 16:30:03.000000000 -0500
@@ -93,7 +93,6 @@ int ssb_pcmcia_switch_core(struct ssb_bu
struct ssb_device *dev)
{
@@ -90742,8 +120994,8 @@
}
diff -up linux-2.6.23.noarch/drivers/ssb/main.c.orig linux-2.6.23.noarch/drivers/ssb/main.c
---- linux-2.6.23.noarch/drivers/ssb/main.c.orig 2008-01-17 14:15:48.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/main.c 2008-01-17 14:16:34.000000000 -0500
+--- linux-2.6.23.noarch/drivers/ssb/main.c.orig 2008-01-23 16:29:08.000000000 -0500
++++ linux-2.6.23.noarch/drivers/ssb/main.c 2008-01-23 16:30:03.000000000 -0500
@@ -877,14 +877,22 @@ EXPORT_SYMBOL(ssb_clockspeed);
static u32 ssb_tmslow_reject_bitmask(struct ssb_device *dev)
@@ -90769,8 +121021,8 @@
}
return (SSB_TMSLOW_REJECT_22 | SSB_TMSLOW_REJECT_23);
diff -up linux-2.6.23.noarch/drivers/ssb/pci.c.orig linux-2.6.23.noarch/drivers/ssb/pci.c
---- linux-2.6.23.noarch/drivers/ssb/pci.c.orig 2008-01-17 14:15:48.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/pci.c 2008-01-17 14:16:34.000000000 -0500
+--- linux-2.6.23.noarch/drivers/ssb/pci.c.orig 2008-01-23 16:29:08.000000000 -0500
++++ linux-2.6.23.noarch/drivers/ssb/pci.c 2008-01-23 16:30:03.000000000 -0500
@@ -212,29 +212,29 @@ static inline u8 ssb_crc8(u8 crc, u8 dat
return t[crc ^ data];
}
@@ -90916,7 +121168,7 @@
SSB_SPROM1_BINF_ANTBG_SHIFT);
SPEX(pa0b0, SSB_SPROM1_PA0B0, 0xFFFF, 0);
SPEX(pa0b1, SSB_SPROM1_PA0B1, 0xFFFF, 0);
-@@ -347,100 +377,105 @@ static void sprom_extract_r1(struct ssb_
+@@ -347,100 +377,108 @@ static void sprom_extract_r1(struct ssb_
SSB_SPROM1_ITSSI_A_SHIFT);
SPEX(itssi_bg, SSB_SPROM1_ITSSI, SSB_SPROM1_ITSSI_BG, 0);
SPEX(boardflags_lo, SSB_SPROM1_BFLLO, 0xFFFF, 0);
@@ -90927,6 +121179,8 @@
- v = in[SPOFF(SSB_SPROM1_OEM) + i];
- *(((__le16 *)out->oem) + i) = cpu_to_le16(v);
- }
++ if (out->revision >= 2)
++ SPEX(boardflags_hi, SSB_SPROM2_BFLHI, 0xFFFF, 0);
+
+ /* Extract the antenna gain values. */
+ gain = r123_extract_antgain(out->revision, in,
@@ -90984,6 +121238,7 @@
+ SSB_SPROM4_ETHPHY_ET1A_SHIFT);
+ SPEX(country_code, SSB_SPROM4_CCODE, 0xFFFF, 0);
+ SPEX(boardflags_lo, SSB_SPROM4_BFLLO, 0xFFFF, 0);
++ SPEX(boardflags_hi, SSB_SPROM4_BFLHI, 0xFFFF, 0);
+ SPEX(ant_available_a, SSB_SPROM4_ANTAVAIL, SSB_SPROM4_ANTAVAIL_A,
+ SSB_SPROM4_ANTAVAIL_A_SHIFT);
+ SPEX(ant_available_bg, SSB_SPROM4_ANTAVAIL, SSB_SPROM4_ANTAVAIL_BG,
@@ -91096,7 +121351,7 @@
goto unsupported;
}
-@@ -448,7 +483,7 @@ static int sprom_extract(struct ssb_bus
+@@ -448,7 +486,7 @@ static int sprom_extract(struct ssb_bus
unsupported:
ssb_printk(KERN_WARNING PFX "Unsupported SPROM revision %d "
"detected. Will extract v1\n", out->revision);
@@ -91105,7 +121360,7 @@
return 0;
}
-@@ -458,16 +493,29 @@ static int ssb_pci_sprom_get(struct ssb_
+@@ -458,16 +496,29 @@ static int ssb_pci_sprom_get(struct ssb_
int err = -ENOMEM;
u16 *buf;
@@ -91140,7 +121395,7 @@
kfree(buf);
out:
-@@ -581,29 +629,28 @@ const struct ssb_bus_ops ssb_pci_ops = {
+@@ -581,29 +632,28 @@ const struct ssb_bus_ops ssb_pci_ops = {
.write32 = ssb_pci_write32,
};
@@ -91175,7 +121430,7 @@
memcpy(tmp, dump, 4);
dump += 4;
parsed = simple_strtoul(tmp, NULL, 16);
-@@ -627,7 +674,7 @@ static ssize_t ssb_pci_attr_sprom_show(s
+@@ -627,7 +677,7 @@ static ssize_t ssb_pci_attr_sprom_show(s
if (!bus)
goto out;
err = -ENOMEM;
@@ -91184,7 +121439,7 @@
if (!sprom)
goto out;
-@@ -640,7 +687,7 @@ static ssize_t ssb_pci_attr_sprom_show(s
+@@ -640,7 +690,7 @@ static ssize_t ssb_pci_attr_sprom_show(s
sprom_do_read(bus, sprom);
mutex_unlock(&bus->pci_sprom_mutex);
@@ -91193,7 +121448,7 @@
err = 0;
out_kfree:
-@@ -662,15 +709,15 @@ static ssize_t ssb_pci_attr_sprom_store(
+@@ -662,15 +712,15 @@ static ssize_t ssb_pci_attr_sprom_store(
if (!bus)
goto out;
err = -ENOMEM;
@@ -91213,13 +121468,12 @@
err = -EINVAL;
goto out_kfree;
diff -up linux-2.6.23.noarch/Documentation/feature-removal-schedule.txt.orig linux-2.6.23.noarch/Documentation/feature-removal-schedule.txt
---- linux-2.6.23.noarch/Documentation/feature-removal-schedule.txt.orig 2008-01-17 14:15:48.000000000 -0500
-+++ linux-2.6.23.noarch/Documentation/feature-removal-schedule.txt 2008-01-17 14:16:34.000000000 -0500
-@@ -316,3 +316,28 @@ Why: powermac supports proper generic pm
- Who: Johannes Berg <johannes at sipsolutions.net>
+--- linux-2.6.23.noarch/Documentation/feature-removal-schedule.txt.orig 2007-10-09 16:31:38.000000000 -0400
++++ linux-2.6.23.noarch/Documentation/feature-removal-schedule.txt 2008-01-23 16:30:03.000000000 -0500
+@@ -305,4 +305,36 @@ Why: In kernel tree version of driver
+ replaced by the skge driver.
+ Who: Stephen Hemminger <shemminger at linux-foundation.org>
- ---------------------------
-+
+What: bcm43xx wireless network driver
+When: 2.6.26
+Files: drivers/net/wireless/bcm43xx
@@ -91235,7 +121489,7 @@
+Why: No in-kernel drivers will depend on it any longer.
+Who: John W. Linville <linville at tuxdriver.com>
+
-+---------------------------
+ ---------------------------
+
+What: rc80211-simple rate control algorithm for mac80211
+When: 2.6.26
@@ -91244,3 +121498,12 @@
+ responsiveness and performance and has some serious flaws. It has been
+ replaced by rc80211-pid.
+Who: Stefano Brivio <stefano.brivio at polimi.it>
++
++---------------------------
++
++What: b43 support for firmware revision < 410
++When: July 2008
++Why: The support code for the old firmware hurts code readability/maintainability
++ and slightly hurts runtime performance. Bugfixes for the old firmware
++ are not provided by Broadcom anymore.
++Who: Michael Buesch <mb at bu3sch.de>
linux-2.6-wireless.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.23 -r 1.24 linux-2.6-wireless.patch
Index: linux-2.6-wireless.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-wireless.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- linux-2.6-wireless.patch 17 Jan 2008 21:36:37 -0000 1.23
+++ linux-2.6-wireless.patch 23 Jan 2008 21:41:08 -0000 1.24
@@ -2,6 +2,20 @@
better in the future...FWIW, it is safe to presume that any wireless
patch between 2.6.23 and 2.6.24-rc5 is included as well... -- JWL
+commit fbcf1789eee4fd700f69653baebf80bfa64d0b56
+Author: Reinette Chatre <reinette.chatre at intel.com>
+Date: Mon Jan 21 10:08:31 2008 -0800
+
+ iwlwifi: fix possible read attempt on ucode that is not available
+
+ This fixes a NULL pointer dereference that can occur when the
+ ucode is not loaded at the time __iwl_up is called.
+
+ The problem was reported at http://kerneloops.org/raw.php?rawid=2765&msgid=
+
+ Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
commit 2518812da9315f4ebc6b11b5289e5ef205a34ced
Author: Eric Paris <eparis at redhat.com>
Date: Sun Jan 13 16:20:56 2008 -0500
@@ -418,8 +432,8 @@
Signed-off-by: John W. Linville <linville at tuxdriver.com>
diff -up linux-2.6.23.noarch/CREDITS.orig linux-2.6.23.noarch/CREDITS
---- linux-2.6.23.noarch/CREDITS.orig 2008-01-17 14:02:25.000000000 -0500
-+++ linux-2.6.23.noarch/CREDITS 2008-01-17 14:04:55.000000000 -0500
+--- linux-2.6.23.noarch/CREDITS.orig 2008-01-23 14:37:26.000000000 -0500
++++ linux-2.6.23.noarch/CREDITS 2008-01-23 14:38:05.000000000 -0500
@@ -665,6 +665,11 @@ D: Minor updates to SCSI types, added /p
S: (ask for current address)
S: USA
@@ -488,7 +502,7 @@
D: Linux System Administrator's Guide, author, former maintainer
diff -up linux-2.6.23.noarch/include/linux/nl80211.h.orig linux-2.6.23.noarch/include/linux/nl80211.h
--- linux-2.6.23.noarch/include/linux/nl80211.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/include/linux/nl80211.h 2008-01-17 14:04:55.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/nl80211.h 2008-01-23 14:38:05.000000000 -0500
@@ -7,7 +7,97 @@
*/
@@ -612,7 +626,7 @@
#endif /* __LINUX_NL80211_H */
diff -up linux-2.6.23.noarch/include/linux/mod_devicetable.h.orig linux-2.6.23.noarch/include/linux/mod_devicetable.h
--- linux-2.6.23.noarch/include/linux/mod_devicetable.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/include/linux/mod_devicetable.h 2008-01-17 14:04:55.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/mod_devicetable.h 2008-01-23 14:38:05.000000000 -0500
@@ -340,4 +340,19 @@ struct parisc_device_id {
#define PA_HVERSION_ANY_ID 0xffff
#define PA_SVERSION_ANY_ID 0xffffffff
@@ -635,7 +649,7 @@
#endif /* LINUX_MOD_DEVICETABLE_H */
diff -up linux-2.6.23.noarch/include/linux/ieee80211.h.orig linux-2.6.23.noarch/include/linux/ieee80211.h
--- linux-2.6.23.noarch/include/linux/ieee80211.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/include/linux/ieee80211.h 2008-01-17 14:04:55.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/ieee80211.h 2008-01-23 14:38:05.000000000 -0500
@@ -16,6 +16,7 @@
#define IEEE80211_H
@@ -711,7 +725,7 @@
#endif /* IEEE80211_H */
diff -up linux-2.6.23.noarch/include/linux/rfkill.h.orig linux-2.6.23.noarch/include/linux/rfkill.h
--- linux-2.6.23.noarch/include/linux/rfkill.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/include/linux/rfkill.h 2008-01-17 14:04:55.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/rfkill.h 2008-01-23 14:38:05.000000000 -0500
@@ -2,7 +2,7 @@
#define __RFKILL_H
@@ -794,8 +808,8 @@
#endif /* RFKILL_H */
diff -up /dev/null linux-2.6.23.noarch/include/linux/ssb/ssb_driver_chipcommon.h
---- /dev/null 2008-01-17 10:02:41.585276202 -0500
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb_driver_chipcommon.h 2008-01-17 14:04:55.000000000 -0500
+--- /dev/null 2008-01-23 09:33:30.193134867 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb_driver_chipcommon.h 2008-01-23 14:38:05.000000000 -0500
@@ -0,0 +1,396 @@
+#ifndef LINUX_SSB_CHIPCO_H_
+#define LINUX_SSB_CHIPCO_H_
@@ -1194,8 +1208,8 @@
+
+#endif /* LINUX_SSB_CHIPCO_H_ */
diff -up /dev/null linux-2.6.23.noarch/include/linux/ssb/ssb_driver_extif.h
---- /dev/null 2008-01-17 10:02:41.585276202 -0500
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb_driver_extif.h 2008-01-17 14:04:55.000000000 -0500
+--- /dev/null 2008-01-23 09:33:30.193134867 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb_driver_extif.h 2008-01-23 14:38:05.000000000 -0500
@@ -0,0 +1,204 @@
+/*
+ * Hardware-specific External Interface I/O core definitions
@@ -1402,8 +1416,8 @@
+#endif /* CONFIG_SSB_DRIVER_EXTIF */
+#endif /* LINUX_SSB_EXTIFCORE_H_ */
diff -up /dev/null linux-2.6.23.noarch/include/linux/ssb/ssb_driver_mips.h
---- /dev/null 2008-01-17 10:02:41.585276202 -0500
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb_driver_mips.h 2008-01-17 14:04:55.000000000 -0500
+--- /dev/null 2008-01-23 09:33:30.193134867 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb_driver_mips.h 2008-01-23 14:38:05.000000000 -0500
@@ -0,0 +1,46 @@
+#ifndef LINUX_SSB_MIPSCORE_H_
+#define LINUX_SSB_MIPSCORE_H_
@@ -1452,8 +1466,8 @@
+
+#endif /* LINUX_SSB_MIPSCORE_H_ */
diff -up /dev/null linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h
---- /dev/null 2008-01-17 10:02:41.585276202 -0500
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h 2008-01-17 14:04:55.000000000 -0500
+--- /dev/null 2008-01-23 09:33:30.193134867 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h 2008-01-23 14:38:05.000000000 -0500
@@ -0,0 +1,292 @@
+#ifndef LINUX_SSB_REGS_H_
+#define LINUX_SSB_REGS_H_
@@ -1748,8 +1762,8 @@
+
+#endif /* LINUX_SSB_REGS_H_ */
diff -up /dev/null linux-2.6.23.noarch/include/linux/ssb/ssb_driver_pci.h
---- /dev/null 2008-01-17 10:02:41.585276202 -0500
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb_driver_pci.h 2008-01-17 14:04:55.000000000 -0500
+--- /dev/null 2008-01-23 09:33:30.193134867 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb_driver_pci.h 2008-01-23 14:38:05.000000000 -0500
@@ -0,0 +1,106 @@
+#ifndef LINUX_SSB_PCICORE_H_
+#define LINUX_SSB_PCICORE_H_
@@ -1858,8 +1872,8 @@
+#endif /* CONFIG_SSB_DRIVER_PCICORE */
+#endif /* LINUX_SSB_PCICORE_H_ */
diff -up /dev/null linux-2.6.23.noarch/include/linux/ssb/ssb.h
---- /dev/null 2008-01-17 10:02:41.585276202 -0500
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb.h 2008-01-17 14:04:55.000000000 -0500
+--- /dev/null 2008-01-23 09:33:30.193134867 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb.h 2008-01-23 14:38:05.000000000 -0500
@@ -0,0 +1,424 @@
+#ifndef LINUX_SSB_H_
+#define LINUX_SSB_H_
@@ -2287,7 +2301,7 @@
+#endif /* LINUX_SSB_H_ */
diff -up linux-2.6.23.noarch/include/net/cfg80211.h.orig linux-2.6.23.noarch/include/net/cfg80211.h
--- linux-2.6.23.noarch/include/net/cfg80211.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/include/net/cfg80211.h 2008-01-17 14:04:55.000000000 -0500
++++ linux-2.6.23.noarch/include/net/cfg80211.h 2008-01-23 14:38:05.000000000 -0500
@@ -3,15 +3,15 @@
#include <linux/netlink.h>
@@ -2326,7 +2340,7 @@
#endif /* __NET_CFG80211_H */
diff -up linux-2.6.23.noarch/include/net/ieee80211.h.orig linux-2.6.23.noarch/include/net/ieee80211.h
--- linux-2.6.23.noarch/include/net/ieee80211.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/include/net/ieee80211.h 2008-01-17 14:04:55.000000000 -0500
++++ linux-2.6.23.noarch/include/net/ieee80211.h 2008-01-23 14:38:05.000000000 -0500
@@ -115,8 +115,16 @@ extern u32 ieee80211_debug_level;
do { if (ieee80211_debug_level & (level)) \
printk(KERN_DEBUG "ieee80211: %c %s " fmt, \
@@ -2346,7 +2360,7 @@
/* debug macros not dependent on CONFIG_IEEE80211_DEBUG */
diff -up linux-2.6.23.noarch/include/net/mac80211.h.orig linux-2.6.23.noarch/include/net/mac80211.h
--- linux-2.6.23.noarch/include/net/mac80211.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/include/net/mac80211.h 2008-01-17 14:04:55.000000000 -0500
++++ linux-2.6.23.noarch/include/net/mac80211.h 2008-01-23 14:38:05.000000000 -0500
@@ -1,7 +1,9 @@
/*
- * Low-level hardware driver -- IEEE 802.11 driver (80211.o) interface
@@ -4038,7 +4052,7 @@
((u8*)(x))[3], ((u8*)(x))[4], ((u8*)(x))[5]
diff -up linux-2.6.23.noarch/include/net/ieee80211softmac.h.orig linux-2.6.23.noarch/include/net/ieee80211softmac.h
--- linux-2.6.23.noarch/include/net/ieee80211softmac.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/include/net/ieee80211softmac.h 2008-01-17 14:04:55.000000000 -0500
++++ linux-2.6.23.noarch/include/net/ieee80211softmac.h 2008-01-23 14:38:05.000000000 -0500
@@ -229,6 +229,8 @@ struct ieee80211softmac_device {
/* this lock protects this structure */
spinlock_t lock;
@@ -4050,7 +4064,7 @@
diff -up linux-2.6.23.noarch/include/net/iw_handler.h.orig linux-2.6.23.noarch/include/net/iw_handler.h
--- linux-2.6.23.noarch/include/net/iw_handler.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/include/net/iw_handler.h 2008-01-17 14:04:55.000000000 -0500
++++ linux-2.6.23.noarch/include/net/iw_handler.h 2008-01-23 14:38:05.000000000 -0500
@@ -431,7 +431,13 @@ struct iw_public_data {
* Those may be called only within the kernel.
*/
@@ -4068,7 +4082,7 @@
extern void wireless_send_event(struct net_device * dev,
diff -up linux-2.6.23.noarch/include/net/ieee80211_radiotap.h.orig linux-2.6.23.noarch/include/net/ieee80211_radiotap.h
--- linux-2.6.23.noarch/include/net/ieee80211_radiotap.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/include/net/ieee80211_radiotap.h 2008-01-17 14:04:55.000000000 -0500
++++ linux-2.6.23.noarch/include/net/ieee80211_radiotap.h 2008-01-23 14:38:05.000000000 -0500
@@ -40,6 +40,7 @@
#include <linux/if_ether.h>
@@ -4092,8 +4106,8 @@
+
#endif /* IEEE80211_RADIOTAP_H */
diff -up linux-2.6.23.noarch/MAINTAINERS.orig linux-2.6.23.noarch/MAINTAINERS
[...2418 lines suppressed...]
@@ -272,7 +272,7 @@ static int sandisk_enable_wireless(struc
{
int res, ret = 0;
@@ -131772,7 +131796,7 @@
MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids);
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_hw.c
--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_hw.c 2008-01-17 14:04:56.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_hw.c 2008-01-23 14:38:06.000000000 -0500
@@ -825,7 +825,7 @@ static int hfa384x_get_rid(struct net_de
local->hw_downloading)
return -ENODEV;
@@ -131853,7 +131877,7 @@
/* Send disconnect event, e.g., to trigger reassociation after resume
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_main.c.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_main.c
--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_main.c.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_main.c 2008-01-17 14:04:56.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_main.c 2008-01-23 14:38:06.000000000 -0500
@@ -72,7 +72,7 @@ struct net_device * hostap_add_interface
dev->mem_start = mdev->mem_start;
dev->mem_end = mdev->mem_end;
@@ -131910,7 +131934,7 @@
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c
--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c 2008-01-17 14:04:56.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c 2008-01-23 14:38:06.000000000 -0500
@@ -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)
@@ -131976,7 +132000,7 @@
u16 reason;
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_plx.c.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_plx.c
--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_plx.c.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_plx.c 2008-01-17 14:09:07.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_plx.c 2008-01-23 14:38:06.000000000 -0500
@@ -608,7 +608,7 @@ static void prism2_plx_remove(struct pci
MODULE_DEVICE_TABLE(pci, prism2_plx_id_table);
@@ -132004,7 +132028,7 @@
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap.h.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap.h
--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap.h 2008-01-17 14:04:56.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap.h 2008-01-23 14:38:06.000000000 -0500
@@ -35,7 +35,7 @@ int hostap_80211_prism_header_parse(stru
int hostap_80211_get_hdrlen(u16 fc);
struct net_device_stats *hostap_get_stats(struct net_device *dev);
@@ -132015,8 +132039,8 @@
int hostap_set_hostapd(local_info_t *local, int val, int rtnl_locked);
int hostap_set_hostapd_sta(local_info_t *local, int val, int rtnl_locked);
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c
---- /dev/null 2008-01-17 10:02:41.585276202 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c 2008-01-17 14:04:56.000000000 -0500
+--- /dev/null 2008-01-23 09:33:30.193134867 -0500
++++ linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c 2008-01-23 14:38:06.000000000 -0500
@@ -0,0 +1,48 @@
+/*
+ * Broadcom 43xx PCI-SSB bridge module
@@ -132067,8 +132091,8 @@
+ ssb_pcihost_unregister(&b43_pci_bridge_driver);
+}
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/Makefile
---- /dev/null 2008-01-17 10:02:41.585276202 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/Makefile 2008-01-17 14:04:56.000000000 -0500
+--- /dev/null 2008-01-23 09:33:30.193134867 -0500
++++ linux-2.6.23.noarch/drivers/ssb/Makefile 2008-01-23 14:38:06.000000000 -0500
@@ -0,0 +1,18 @@
+# core
+ssb-y += main.o scan.o
@@ -132089,8 +132113,8 @@
+
+obj-$(CONFIG_SSB) += ssb.o
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/pcmcia.c
---- /dev/null 2008-01-17 10:02:41.585276202 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/pcmcia.c 2008-01-17 14:04:56.000000000 -0500
+--- /dev/null 2008-01-23 09:33:30.193134867 -0500
++++ linux-2.6.23.noarch/drivers/ssb/pcmcia.c 2008-01-23 14:38:06.000000000 -0500
@@ -0,0 +1,271 @@
+/*
+ * Sonics Silicon Backplane
@@ -132364,8 +132388,8 @@
+ return -ENODEV;
+}
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/main.c
---- /dev/null 2008-01-17 10:02:41.585276202 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/main.c 2008-01-17 14:04:56.000000000 -0500
+--- /dev/null 2008-01-23 09:33:30.193134867 -0500
++++ linux-2.6.23.noarch/drivers/ssb/main.c 2008-01-23 14:38:06.000000000 -0500
@@ -0,0 +1,1166 @@
+/*
+ * Sonics Silicon Backplane
@@ -133534,8 +133558,8 @@
+}
+module_exit(ssb_modexit)
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/pcihost_wrapper.c
---- /dev/null 2008-01-17 10:02:41.585276202 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/pcihost_wrapper.c 2008-01-17 14:04:56.000000000 -0500
+--- /dev/null 2008-01-23 09:33:30.193134867 -0500
++++ linux-2.6.23.noarch/drivers/ssb/pcihost_wrapper.c 2008-01-23 14:38:06.000000000 -0500
@@ -0,0 +1,104 @@
+/*
+ * Sonics Silicon Backplane
@@ -133642,8 +133666,8 @@
+}
+EXPORT_SYMBOL(ssb_pcihost_register);
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/driver_mipscore.c
---- /dev/null 2008-01-17 10:02:41.585276202 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/driver_mipscore.c 2008-01-17 14:04:56.000000000 -0500
+--- /dev/null 2008-01-23 09:33:30.193134867 -0500
++++ linux-2.6.23.noarch/drivers/ssb/driver_mipscore.c 2008-01-23 14:38:06.000000000 -0500
@@ -0,0 +1,224 @@
+/*
+ * Sonics Silicon Backplane
@@ -133870,8 +133894,8 @@
+ ssb_mips_flash_detect(mcore);
+}
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/ssb_private.h
---- /dev/null 2008-01-17 10:02:41.585276202 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/ssb_private.h 2008-01-17 14:04:56.000000000 -0500
+--- /dev/null 2008-01-23 09:33:30.193134867 -0500
++++ linux-2.6.23.noarch/drivers/ssb/ssb_private.h 2008-01-23 14:38:06.000000000 -0500
@@ -0,0 +1,136 @@
+#ifndef LINUX_SSB_PRIVATE_H_
+#define LINUX_SSB_PRIVATE_H_
@@ -134010,8 +134034,8 @@
+
+#endif /* LINUX_SSB_PRIVATE_H_ */
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/pci.c
---- /dev/null 2008-01-17 10:02:41.585276202 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/pci.c 2008-01-17 14:04:56.000000000 -0500
+--- /dev/null 2008-01-23 09:33:30.193134867 -0500
++++ linux-2.6.23.noarch/drivers/ssb/pci.c 2008-01-23 14:38:06.000000000 -0500
@@ -0,0 +1,740 @@
+/*
+ * Sonics Silicon Backplane PCI-Hostbus related functions.
@@ -134754,8 +134778,8 @@
+ return err;
+}
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/driver_chipcommon.c
---- /dev/null 2008-01-17 10:02:41.585276202 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/driver_chipcommon.c 2008-01-17 14:04:56.000000000 -0500
+--- /dev/null 2008-01-23 09:33:30.193134867 -0500
++++ linux-2.6.23.noarch/drivers/ssb/driver_chipcommon.c 2008-01-23 14:38:06.000000000 -0500
@@ -0,0 +1,445 @@
+/*
+ * Sonics Silicon Backplane
@@ -135203,8 +135227,8 @@
+}
+#endif /* CONFIG_SSB_SERIAL */
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/Kconfig
---- /dev/null 2008-01-17 10:02:41.585276202 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/Kconfig 2008-01-17 14:04:56.000000000 -0500
+--- /dev/null 2008-01-23 09:33:30.193134867 -0500
++++ linux-2.6.23.noarch/drivers/ssb/Kconfig 2008-01-23 14:38:06.000000000 -0500
@@ -0,0 +1,117 @@
+menu "Sonics Silicon Backplane"
+
@@ -135324,8 +135348,8 @@
+
+endmenu
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/scan.c
---- /dev/null 2008-01-17 10:02:41.585276202 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/scan.c 2008-01-17 14:04:56.000000000 -0500
+--- /dev/null 2008-01-23 09:33:30.193134867 -0500
++++ linux-2.6.23.noarch/drivers/ssb/scan.c 2008-01-23 14:38:06.000000000 -0500
@@ -0,0 +1,413 @@
+/*
+ * Sonics Silicon Backplane
@@ -135741,8 +135765,8 @@
+ goto out;
+}
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/driver_extif.c
---- /dev/null 2008-01-17 10:02:41.585276202 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/driver_extif.c 2008-01-17 14:04:56.000000000 -0500
+--- /dev/null 2008-01-23 09:33:30.193134867 -0500
++++ linux-2.6.23.noarch/drivers/ssb/driver_extif.c 2008-01-23 14:38:06.000000000 -0500
@@ -0,0 +1,129 @@
+/*
+ * Sonics Silicon Backplane
@@ -135874,8 +135898,8 @@
+}
+
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/driver_pcicore.c
---- /dev/null 2008-01-17 10:02:41.585276202 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/driver_pcicore.c 2008-01-17 14:04:56.000000000 -0500
+--- /dev/null 2008-01-23 09:33:30.193134867 -0500
++++ linux-2.6.23.noarch/drivers/ssb/driver_pcicore.c 2008-01-23 14:38:06.000000000 -0500
@@ -0,0 +1,576 @@
+/*
+ * Sonics Silicon Backplane
@@ -136455,7 +136479,7 @@
+EXPORT_SYMBOL(ssb_pcicore_dev_irqvecs_enable);
diff -up linux-2.6.23.noarch/Documentation/networking/mac80211-injection.txt.orig linux-2.6.23.noarch/Documentation/networking/mac80211-injection.txt
--- linux-2.6.23.noarch/Documentation/networking/mac80211-injection.txt.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/Documentation/networking/mac80211-injection.txt 2008-01-17 14:04:56.000000000 -0500
++++ linux-2.6.23.noarch/Documentation/networking/mac80211-injection.txt 2008-01-23 14:38:06.000000000 -0500
@@ -13,15 +13,35 @@ The radiotap format is discussed in
./Documentation/networking/radiotap-headers.txt.
--- linux-2.6-ath5k.patch DELETED ---
--- linux-2.6-rtl8180.patch DELETED ---
--- linux-2.6-wireless-pending-too.patch DELETED ---
More information about the fedora-extras-commits
mailing list