rpms/kernel/F-8 linux-2.6-wireless-pending.patch, 1.11.2.6, 1.11.2.7 linux-2.6-wireless.patch, 1.10.8.4, 1.10.8.5
John W. Linville (linville)
fedora-extras-commits at redhat.com
Thu Nov 8 03:16:15 UTC 2007
Author: linville
Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32112
Modified Files:
Tag: private-linville-wl-f8-branch
linux-2.6-wireless-pending.patch linux-2.6-wireless.patch
Log Message:
a few more wireless fixes
linux-2.6-wireless-pending.patch:
Index: linux-2.6-wireless-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/Attic/linux-2.6-wireless-pending.patch,v
retrieving revision 1.11.2.6
retrieving revision 1.11.2.7
diff -u -r1.11.2.6 -r1.11.2.7
--- linux-2.6-wireless-pending.patch 7 Nov 2007 03:51:24 -0000 1.11.2.6
+++ linux-2.6-wireless-pending.patch 8 Nov 2007 03:15:07 -0000 1.11.2.7
@@ -1,6 +1,6 @@
diff -up linux-2.6.23.noarch/drivers/net/wireless/atmel.c.orig linux-2.6.23.noarch/drivers/net/wireless/atmel.c
---- linux-2.6.23.noarch/drivers/net/wireless/atmel.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/atmel.c 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/atmel.c.orig 2007-11-07 21:55:46.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/atmel.c 2007-11-07 22:04:40.000000000 -0500
@@ -1761,7 +1761,7 @@ static int atmel_set_encode(struct net_d
priv->default_key = index;
} else
@@ -11,8 +11,8 @@
}
}
diff -up linux-2.6.23.noarch/drivers/net/wireless/p54pci.c.orig linux-2.6.23.noarch/drivers/net/wireless/p54pci.c
---- linux-2.6.23.noarch/drivers/net/wireless/p54pci.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/p54pci.c 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/p54pci.c.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/p54pci.c 2007-11-07 22:04:40.000000000 -0500
@@ -141,6 +141,7 @@ static irqreturn_t p54p_simple_interrupt
static int p54p_read_eeprom(struct ieee80211_hw *dev)
{
@@ -234,8 +234,8 @@
static int __devinit p54p_probe(struct pci_dev *pdev,
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43/main.c.orig linux-2.6.23.noarch/drivers/net/wireless/b43/main.c
---- linux-2.6.23.noarch/drivers/net/wireless/b43/main.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/main.c 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/main.c.orig 2007-11-07 22:00:39.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/main.c 2007-11-07 22:04:40.000000000 -0500
@@ -75,14 +75,6 @@ module_param_named(bad_frames_preempt, m
MODULE_PARM_DESC(bad_frames_preempt,
"enable(1) / disable(0) Bad Frames Preemption");
@@ -406,7 +406,7 @@
{
struct b43_wl *wl = hw_to_b43_wl(hw);
struct b43_wldev *dev = wl->current_dev;
-@@ -3258,6 +3249,22 @@ static void b43_imcfglo_timeouts_workaro
+@@ -3261,6 +3252,22 @@ static void b43_imcfglo_timeouts_workaro
#endif /* CONFIG_SSB_DRIVER_PCICORE */
}
@@ -429,7 +429,7 @@
/* Shutdown a wireless core */
/* Locking: wl->mutex */
static void b43_wireless_core_exit(struct b43_wldev *dev)
-@@ -3346,15 +3353,8 @@ static int b43_wireless_core_init(struct
+@@ -3349,15 +3356,8 @@ static int b43_wireless_core_init(struct
}
b43_hf_write(dev, hf);
@@ -447,7 +447,7 @@
b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_SFFBLIM, 3);
b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_LFFBLIM, 2);
-@@ -3423,8 +3423,8 @@ static int b43_wireless_core_init(struct
+@@ -3426,8 +3426,8 @@ static int b43_wireless_core_init(struct
return err;
}
@@ -458,7 +458,7 @@
{
struct b43_wl *wl = hw_to_b43_wl(hw);
struct b43_wldev *dev;
-@@ -3463,8 +3463,8 @@ static int b43_add_interface(struct ieee
+@@ -3466,8 +3466,8 @@ static int b43_add_interface(struct ieee
return err;
}
@@ -469,7 +469,7 @@
{
struct b43_wl *wl = hw_to_b43_wl(hw);
struct b43_wldev *dev = wl->current_dev;
-@@ -3488,7 +3488,7 @@ static void b43_remove_interface(struct
+@@ -3491,7 +3491,7 @@ static void b43_remove_interface(struct
mutex_unlock(&wl->mutex);
}
@@ -478,7 +478,7 @@
{
struct b43_wl *wl = hw_to_b43_wl(hw);
struct b43_wldev *dev = wl->current_dev;
-@@ -3519,7 +3519,7 @@ static int b43_start(struct ieee80211_hw
+@@ -3522,7 +3522,7 @@ static int b43_start(struct ieee80211_hw
return err;
}
@@ -487,7 +487,7 @@
{
struct b43_wl *wl = hw_to_b43_wl(hw);
struct b43_wldev *dev = wl->current_dev;
-@@ -3531,19 +3531,40 @@ static void b43_stop(struct ieee80211_hw
+@@ -3534,19 +3534,40 @@ static void b43_stop(struct ieee80211_hw
mutex_unlock(&wl->mutex);
}
@@ -540,25 +540,9 @@
};
/* Hard-reset the chip. Do not call this directly.
-@@ -3660,7 +3681,6 @@ static int b43_setup_modes(struct b43_wl
-
- static void b43_wireless_core_detach(struct b43_wldev *dev)
- {
-- b43_rfkill_free(dev);
- /* We release firmware that late to not be required to re-request
- * is all the time when we reinit the core. */
- b43_release_firmware(dev);
-@@ -3746,7 +3766,6 @@ static int b43_wireless_core_attach(stru
- if (!wl->current_dev)
- wl->current_dev = dev;
- INIT_WORK(&dev->restart_work, b43_chip_reset);
-- b43_rfkill_alloc(dev);
-
- b43_radio_turn_off(dev, 1);
- b43_switch_analog(dev, 0);
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43/xmit.c.orig linux-2.6.23.noarch/drivers/net/wireless/b43/xmit.c
---- linux-2.6.23.noarch/drivers/net/wireless/b43/xmit.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/xmit.c 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/xmit.c.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/xmit.c 2007-11-07 22:04:40.000000000 -0500
@@ -294,6 +294,8 @@ static void generate_txhdr_fw4(struct b4
mac_ctl |= B43_TX4_MAC_STMSDU;
if (phy->type == B43_PHYTYPE_A)
@@ -576,237 +560,9 @@
}
/* Magic cookie */
-diff -up linux-2.6.23.noarch/drivers/net/wireless/b43/debugfs.c.orig linux-2.6.23.noarch/drivers/net/wireless/b43/debugfs.c
---- linux-2.6.23.noarch/drivers/net/wireless/b43/debugfs.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/debugfs.c 2007-11-06 22:39:28.000000000 -0500
-@@ -128,7 +128,7 @@ static ssize_t shm_read_file(struct b43_
- __le16 *le16buf = (__le16 *)buf;
-
- for (i = 0; i < 0x1000; i++) {
-- if (bufsize <= 0)
-+ if (bufsize < sizeof(tmp))
- break;
- tmp = b43_shm_read16(dev, B43_SHM_SHARED, 2 * i);
- le16buf[i] = cpu_to_le16(tmp);
-diff -up linux-2.6.23.noarch/drivers/net/wireless/b43/rfkill.h.orig linux-2.6.23.noarch/drivers/net/wireless/b43/rfkill.h
---- linux-2.6.23.noarch/drivers/net/wireless/b43/rfkill.h.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/rfkill.h 2007-11-06 22:39:28.000000000 -0500
-@@ -15,14 +15,14 @@ struct b43_rfkill {
- struct rfkill *rfkill;
- /* The poll device for the RFKILL input button */
- struct input_polled_dev *poll_dev;
-+ /* Did initialization succeed? Used for freeing. */
-+ bool registered;
- /* The unique name of this rfkill switch */
-- char name[32];
-+ char name[sizeof("b43-phy4294967295")];
- };
-
--/* All the init functions return void, because we are not interested
-+/* The init function returns void, because we are not interested
- * in failing the b43 init process when rfkill init failed. */
--void b43_rfkill_alloc(struct b43_wldev *dev);
--void b43_rfkill_free(struct b43_wldev *dev);
- void b43_rfkill_init(struct b43_wldev *dev);
- void b43_rfkill_exit(struct b43_wldev *dev);
-
-@@ -36,12 +36,6 @@ struct b43_rfkill {
- /* empty */
- };
-
--static inline void b43_rfkill_alloc(struct b43_wldev *dev)
--{
--}
--static inline void b43_rfkill_free(struct b43_wldev *dev)
--{
--}
- static inline void b43_rfkill_init(struct b43_wldev *dev)
- {
- }
-diff -up linux-2.6.23.noarch/drivers/net/wireless/b43/rfkill.c.orig linux-2.6.23.noarch/drivers/net/wireless/b43/rfkill.c
---- linux-2.6.23.noarch/drivers/net/wireless/b43/rfkill.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/rfkill.c 2007-11-06 22:39:28.000000000 -0500
-@@ -47,32 +47,35 @@ static void b43_rfkill_poll(struct input
- struct b43_wldev *dev = poll_dev->private;
- struct b43_wl *wl = dev->wl;
- bool enabled;
-+ bool report_change = 0;
-
- mutex_lock(&wl->mutex);
- B43_WARN_ON(b43_status(dev) < B43_STAT_INITIALIZED);
- enabled = b43_is_hw_radio_enabled(dev);
- if (unlikely(enabled != dev->radio_hw_enable)) {
- dev->radio_hw_enable = enabled;
-+ report_change = 1;
- b43info(wl, "Radio hardware status changed to %s\n",
- enabled ? "ENABLED" : "DISABLED");
-- mutex_unlock(&wl->mutex);
-+ }
-+ mutex_unlock(&wl->mutex);
-+
-+ if (unlikely(report_change))
- input_report_key(poll_dev->input, KEY_WLAN, enabled);
-- } else
-- mutex_unlock(&wl->mutex);
- }
-
--/* Called when the RFKILL toggled in software.
-- * This is called without locking. */
-+/* Called when the RFKILL toggled in software. */
- static int b43_rfkill_soft_toggle(void *data, enum rfkill_state state)
- {
- struct b43_wldev *dev = data;
- struct b43_wl *wl = dev->wl;
- int err = 0;
-
-- mutex_lock(&wl->mutex);
-- if (b43_status(dev) < B43_STAT_INITIALIZED)
-- goto out_unlock;
-+ if (!wl->rfkill.registered)
-+ return 0;
-
-+ mutex_lock(&wl->mutex);
-+ B43_WARN_ON(b43_status(dev) < B43_STAT_INITIALIZED);
- switch (state) {
- case RFKILL_STATE_ON:
- if (!dev->radio_hw_enable) {
-@@ -89,7 +92,6 @@ static int b43_rfkill_soft_toggle(void *
- b43_radio_turn_off(dev, 0);
- break;
- }
--
- out_unlock:
- mutex_unlock(&wl->mutex);
-
-@@ -98,11 +100,11 @@ out_unlock:
-
- char * b43_rfkill_led_name(struct b43_wldev *dev)
- {
-- struct b43_wl *wl = dev->wl;
-+ struct b43_rfkill *rfk = &(dev->wl->rfkill);
-
-- if (!wl->rfkill.rfkill)
-+ if (!rfk->registered)
- return NULL;
-- return rfkill_get_led_name(wl->rfkill.rfkill);
-+ return rfkill_get_led_name(rfk->rfkill);
- }
-
- void b43_rfkill_init(struct b43_wldev *dev)
-@@ -111,53 +113,13 @@ void b43_rfkill_init(struct b43_wldev *d
- struct b43_rfkill *rfk = &(wl->rfkill);
- int err;
-
-- if (rfk->rfkill) {
-- err = rfkill_register(rfk->rfkill);
-- if (err) {
-- b43warn(wl, "Failed to register RF-kill button\n");
-- goto err_free_rfk;
-- }
-- }
-- if (rfk->poll_dev) {
-- err = input_register_polled_device(rfk->poll_dev);
-- if (err) {
-- b43warn(wl, "Failed to register RF-kill polldev\n");
-- goto err_free_polldev;
-- }
-- }
--
-- return;
--err_free_rfk:
-- rfkill_free(rfk->rfkill);
-- rfk->rfkill = NULL;
--err_free_polldev:
-- input_free_polled_device(rfk->poll_dev);
-- rfk->poll_dev = NULL;
--}
--
--void b43_rfkill_exit(struct b43_wldev *dev)
--{
-- struct b43_rfkill *rfk = &(dev->wl->rfkill);
--
-- if (rfk->poll_dev)
-- input_unregister_polled_device(rfk->poll_dev);
-- if (rfk->rfkill)
-- rfkill_unregister(rfk->rfkill);
--}
--
--void b43_rfkill_alloc(struct b43_wldev *dev)
--{
-- struct b43_wl *wl = dev->wl;
-- struct b43_rfkill *rfk = &(wl->rfkill);
-+ rfk->registered = 0;
-
-+ rfk->rfkill = rfkill_allocate(dev->dev->dev, RFKILL_TYPE_WLAN);
-+ if (!rfk->rfkill)
-+ goto out_error;
- snprintf(rfk->name, sizeof(rfk->name),
- "b43-%s", wiphy_name(wl->hw->wiphy));
--
-- rfk->rfkill = rfkill_allocate(dev->dev->dev, RFKILL_TYPE_WLAN);
-- if (!rfk->rfkill) {
-- b43warn(wl, "Failed to allocate RF-kill button\n");
-- return;
-- }
- rfk->rfkill->name = rfk->name;
- rfk->rfkill->state = RFKILL_STATE_ON;
- rfk->rfkill->data = dev;
-@@ -165,18 +127,45 @@ void b43_rfkill_alloc(struct b43_wldev *
- rfk->rfkill->user_claim_unsupported = 1;
-
- rfk->poll_dev = input_allocate_polled_device();
-- if (rfk->poll_dev) {
-- rfk->poll_dev->private = dev;
-- rfk->poll_dev->poll = b43_rfkill_poll;
-- rfk->poll_dev->poll_interval = 1000; /* msecs */
-- } else
-- b43warn(wl, "Failed to allocate RF-kill polldev\n");
-+ if (!rfk->poll_dev)
-+ goto err_free_rfk;
-+ rfk->poll_dev->private = dev;
-+ rfk->poll_dev->poll = b43_rfkill_poll;
-+ rfk->poll_dev->poll_interval = 1000; /* msecs */
-+
-+ err = rfkill_register(rfk->rfkill);
-+ if (err)
-+ goto err_free_polldev;
-+ err = input_register_polled_device(rfk->poll_dev);
-+ if (err)
-+ goto err_unreg_rfk;
-+
-+ rfk->registered = 1;
-+
-+ return;
-+err_unreg_rfk:
-+ rfkill_unregister(rfk->rfkill);
-+err_free_polldev:
-+ input_free_polled_device(rfk->poll_dev);
-+ rfk->poll_dev = NULL;
-+err_free_rfk:
-+ rfkill_free(rfk->rfkill);
-+ rfk->rfkill = NULL;
-+out_error:
-+ rfk->registered = 0;
-+ b43warn(wl, "RF-kill button init failed\n");
- }
-
--void b43_rfkill_free(struct b43_wldev *dev)
-+void b43_rfkill_exit(struct b43_wldev *dev)
- {
- struct b43_rfkill *rfk = &(dev->wl->rfkill);
-
-+ if (!rfk->registered)
-+ return;
-+ rfk->registered = 0;
-+
-+ input_unregister_polled_device(rfk->poll_dev);
-+ rfkill_unregister(rfk->rfkill);
- input_free_polled_device(rfk->poll_dev);
- rfk->poll_dev = NULL;
- rfkill_free(rfk->rfkill);
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-commands.h
--- /dev/null 2007-10-26 17:27:29.928203379 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-commands.h 2007-11-06 22:39:28.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-commands.h 2007-11-07 22:04:40.000000000 -0500
@@ -0,0 +1,1582 @@
+/******************************************************************************
+ *
@@ -2391,8 +2147,8 @@
+
+#endif /* __iwl_commands_h__ */
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c
---- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c 2007-11-07 22:04:40.000000000 -0500
@@ -37,12 +37,11 @@
#include <net/mac80211.h>
#include <linux/etherdevice.h>
@@ -3292,8 +3048,8 @@
return rc;
}
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-hw.h.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-hw.h
---- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-hw.h.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-hw.h 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-hw.h.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-hw.h 2007-11-07 22:04:40.000000000 -0500
@@ -8,7 +8,7 @@
* Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved.
*
@@ -4034,8 +3790,8 @@
struct iwl_shared {
struct iwl4965_sched_queue_byte_cnt_tbl
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/Kconfig.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/Kconfig
---- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/Kconfig.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/Kconfig 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/Kconfig.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/Kconfig 2007-11-07 22:04:40.000000000 -0500
@@ -1,107 +1,95 @@
-config IWLWIFI
- bool "Intel Wireless WiFi Link Drivers"
@@ -4253,8 +4009,8 @@
+ any problems you may encounter.
+
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-prph.h.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-prph.h
---- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-prph.h.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-prph.h 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-prph.h.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-prph.h 2007-11-07 22:04:40.000000000 -0500
@@ -8,7 +8,7 @@
* Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved.
*
@@ -4322,8 +4078,8 @@
#endif /* __iwl_prph_h__ */
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-hw.h.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-hw.h
---- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-hw.h.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-hw.h 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-hw.h.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-hw.h 2007-11-07 22:04:40.000000000 -0500
@@ -8,7 +8,7 @@
* Copyright(c) 2005 - 2007 Intel Corporation. All rights reserved.
*
@@ -4968,8 +4724,8 @@
/* card static random access memory (SRAM) for processor data and instructs */
#define ALM_RTC_INST_UPPER_BOUND (0x014000)
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c
---- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c 2007-11-07 22:04:40.000000000 -0500
@@ -57,16 +57,16 @@
#include <asm/div64.h>
@@ -6272,7 +6028,7 @@
pci_unregister_driver(&iwl_driver);
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-debug.h
--- /dev/null 2007-10-26 17:27:29.928203379 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-debug.h 2007-11-06 22:39:28.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-debug.h 2007-11-07 22:04:40.000000000 -0500
@@ -0,0 +1,152 @@
+/******************************************************************************
+ *
@@ -6427,8 +6183,8 @@
+
+#endif
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c
---- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c 2007-11-07 22:04:40.000000000 -0500
@@ -57,16 +57,16 @@
#include <asm/div64.h>
@@ -8055,7 +7811,7 @@
pci_unregister_driver(&iwl_driver);
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-commands.h
--- /dev/null 2007-10-26 17:27:29.928203379 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-commands.h 2007-11-06 22:39:28.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-commands.h 2007-11-07 22:04:40.000000000 -0500
@@ -0,0 +1,1467 @@
+/******************************************************************************
+ *
@@ -9525,8 +9281,8 @@
+
+#endif /* __iwl_3945_commands_h__ */
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.h.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.h
---- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.h.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.h 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.h.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.h 2007-11-07 22:04:40.000000000 -0500
@@ -230,7 +230,7 @@ extern int iwl_rate_index_from_plcp(int
* iwl_fill_rs_info - Fill an output text buffer with the rate representation
*
@@ -9546,8 +9302,8 @@
*/
extern void iwl_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id);
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c
---- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c 2007-11-07 22:04:40.000000000 -0500
@@ -39,11 +39,8 @@
#include <linux/etherdevice.h>
@@ -10015,7 +9771,7 @@
return 0;
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-io.h
--- /dev/null 2007-10-26 17:27:29.928203379 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-io.h 2007-11-06 22:39:28.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-io.h 2007-11-07 22:04:40.000000000 -0500
@@ -0,0 +1,431 @@
+/******************************************************************************
+ *
@@ -10450,7 +10206,7 @@
+#endif
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-io.h
--- /dev/null 2007-10-26 17:27:29.928203379 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-io.h 2007-11-06 22:39:28.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-io.h 2007-11-07 22:04:40.000000000 -0500
@@ -0,0 +1,431 @@
+/******************************************************************************
+ *
@@ -10884,8 +10640,8 @@
+}
+#endif
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h
---- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h 2007-11-07 22:04:40.000000000 -0500
@@ -27,15 +27,974 @@
#ifndef __iwl_3945_h__
#define __iwl_3945_h__
@@ -11864,8 +11620,8 @@
+
#endif
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.h.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.h
---- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.h.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.h 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.h.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.h 2007-11-07 22:04:40.000000000 -0500
@@ -155,7 +155,7 @@ static inline u8 iwl_get_prev_ieee_rate(
* iwl_fill_rs_info - Fill an output text buffer with the rate representation
*
@@ -11885,8 +11641,8 @@
*/
extern void iwl_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id);
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.c.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
---- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.c 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.c.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.c 2007-11-07 22:04:40.000000000 -0500
@@ -37,11 +37,9 @@
#include <linux/workqueue.h>
@@ -11919,8 +11675,8 @@
if (unlikely(phymode == MODE_IEEE80211A)) {
int i;
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
---- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c 2007-11-07 22:04:40.000000000 -0500
@@ -36,11 +36,9 @@
#include <linux/workqueue.h>
@@ -12390,8 +12146,8 @@
rs_priv->search_better_tbl, sta->last_txrate);
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965.h.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965.h
---- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965.h.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965.h 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965.h.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965.h 2007-11-07 22:04:40.000000000 -0500
@@ -26,13 +26,714 @@
#ifndef __iwl_4965_h__
#define __iwl_4965_h__
@@ -13477,7 +13233,7 @@
#endif /* __iwl_4965_h__ */
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-debug.h
--- /dev/null 2007-10-26 17:27:29.928203379 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-debug.h 2007-11-06 22:39:28.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-debug.h 2007-11-07 22:04:40.000000000 -0500
@@ -0,0 +1,152 @@
+/******************************************************************************
+ *
@@ -13632,8 +13388,8 @@
+
+#endif
diff -up linux-2.6.23.noarch/drivers/net/wireless/Makefile.orig linux-2.6.23.noarch/drivers/net/wireless/Makefile
---- linux-2.6.23.noarch/drivers/net/wireless/Makefile.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/Makefile 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/Makefile.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/Makefile 2007-11-07 22:04:40.000000000 -0500
@@ -52,7 +52,8 @@ obj-$(CONFIG_RTL8187) += rtl8187.o
obj-$(CONFIG_ADM8211) += adm8211.o
@@ -13645,8 +13401,8 @@
obj-$(CONFIG_RT2X00) += rt2x00/
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.c.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.c
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.c 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.c.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.c 2007-11-07 22:04:40.000000000 -0500
@@ -52,7 +52,7 @@
* the access attempt is considered to have failed,
* and we will print an error.
@@ -14267,8 +14023,8 @@
TXD_DESC_SIZE),
skb->len - TXD_DESC_SIZE, control);
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.c
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.c 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.c 2007-11-07 22:04:40.000000000 -0500
@@ -52,8 +52,9 @@
* between each attampt. When the busy bit is still set at that time,
* the access attempt is considered to have failed,
@@ -14760,8 +14516,8 @@
TXD_DESC_SIZE),
skb->len - TXD_DESC_SIZE, control);
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.h.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.h
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.h.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.h 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.h.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.h 2007-11-07 22:04:40.000000000 -0500
@@ -713,13 +713,19 @@ struct hw_pairwise_ta_entry {
* R4: RX antenna control
* FRAME_END: 1 - DPDT, 0 - SPDT (Only valid for 802.11G, RF2527 & RF2529)
@@ -14796,8 +14552,8 @@
/*
* TX descriptor format for TX, PRIO and Beacon Ring.
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00.h.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00.h
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00.h.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00.h 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00.h.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00.h 2007-11-07 22:04:40.000000000 -0500
@@ -31,6 +31,7 @@
#include <linux/skbuff.h>
#include <linux/workqueue.h>
@@ -15130,8 +14886,8 @@
unsigned int length,
struct ieee80211_tx_control *control);
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00config.c.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00config.c
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00config.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00config.c 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00config.c.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00config.c 2007-11-07 22:04:40.000000000 -0500
@@ -94,12 +94,44 @@ void rt2x00lib_config_type(struct rt2x00
rt2x00dev->ops->lib->config_type(rt2x00dev, type, tsf_sync);
}
@@ -15263,8 +15019,8 @@
+ }
}
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c 2007-11-07 22:04:40.000000000 -0500
@@ -67,7 +67,21 @@ EXPORT_SYMBOL_GPL(rt2x00lib_get_ring);
*/
static void rt2x00lib_start_link_tuner(struct rt2x00_dev *rt2x00dev)
@@ -15560,8 +15316,8 @@
tx_rate = control->rts_cts_rate;
}
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.h.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.h
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.h.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.h 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.h.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.h 2007-11-07 22:04:40.000000000 -0500
@@ -430,10 +430,21 @@
/*
@@ -15597,8 +15353,8 @@
/*
* TX descriptor format for TX, PRIO, ATIM and Beacon Ring.
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00rfkill.c.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00rfkill.c
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00rfkill.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00rfkill.c 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00rfkill.c.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00rfkill.c 2007-11-07 22:04:40.000000000 -0500
@@ -68,8 +68,10 @@ static void rt2x00rfkill_poll(struct inp
struct rt2x00_dev *rt2x00dev = poll_dev->private;
int state = rt2x00dev->ops->lib->rfkill_poll(rt2x00dev);
@@ -15689,8 +15445,8 @@
rfkill_free(rt2x00dev->rfkill);
}
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00lib.h.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00lib.h
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00lib.h.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00lib.h 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00lib.h.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00lib.h 2007-11-07 22:04:40.000000000 -0500
@@ -53,6 +53,8 @@ void rt2x00lib_uninitialize(struct rt2x0
void rt2x00lib_config_mac_addr(struct rt2x00_dev *rt2x00dev, u8 *mac);
void rt2x00lib_config_bssid(struct rt2x00_dev *rt2x00dev, u8 *bssid);
@@ -15701,8 +15457,8 @@
struct ieee80211_conf *conf, const int force_config);
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.h.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.h
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.h.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.h 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.h.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.h 2007-11-07 22:04:40.000000000 -0500
@@ -1077,13 +1077,19 @@ struct hw_pairwise_ta_entry {
* R4: RX antenna control
* FRAME_END: 1 - DPDT, 0 - SPDT (Only valid for 802.11G, RF2527 & RF2529)
@@ -15737,8 +15493,8 @@
/*
* TX descriptor format for TX, PRIO and Beacon Ring.
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c 2007-11-07 22:04:40.000000000 -0500
@@ -31,6 +31,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -15837,8 +15593,8 @@
retval = rt2x00usb_alloc_reg(rt2x00dev);
if (retval)
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.c.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.c
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.c 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.c.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.c 2007-11-07 22:04:40.000000000 -0500
@@ -54,7 +54,7 @@
* the access attempt is considered to have failed,
* and we will print an error.
@@ -16127,8 +15883,8 @@
/*
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2400pci.h.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2400pci.h
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2400pci.h.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2400pci.h 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2400pci.h.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2400pci.h 2007-11-07 22:04:40.000000000 -0500
@@ -803,8 +803,8 @@
/*
* DMA descriptor defines.
@@ -16141,8 +15897,8 @@
/*
* TX descriptor format for TX, PRIO, ATIM and Beacon Ring.
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h 2007-11-07 22:04:40.000000000 -0500
@@ -57,7 +57,7 @@
/*
* Register access.
@@ -16179,8 +15935,8 @@
void *value, const u16 length)
{
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00debug.h.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00debug.h
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00debug.h.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00debug.h 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00debug.h.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00debug.h 2007-11-07 22:04:40.000000000 -0500
@@ -30,9 +30,9 @@ struct rt2x00_dev;
#define RT2X00DEBUGFS_REGISTER_ENTRY(__name, __type) \
@@ -16194,8 +15950,8 @@
\
unsigned int word_size; \
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00ring.h.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00ring.h
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00ring.h.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00ring.h 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00ring.h.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00ring.h 2007-11-07 22:04:40.000000000 -0500
@@ -27,20 +27,6 @@
#define RT2X00RING_H
@@ -16247,8 +16003,8 @@
#endif /* RT2X00RING_H */
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00usb.h.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00usb.h
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00usb.h.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00usb.h 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00usb.h.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00usb.h 2007-11-07 22:04:40.000000000 -0500
@@ -91,7 +91,7 @@
* a buffer allocated by kmalloc. Failure to do so can lead
* to unexpected behavior depending on the architecture.
@@ -16299,8 +16055,8 @@
int timeout = REGISTER_TIMEOUT * (lenght / sizeof(u16));
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2400pci.c.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2400pci.c
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2400pci.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2400pci.c 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2400pci.c.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2400pci.c 2007-11-07 22:04:40.000000000 -0500
@@ -54,7 +54,7 @@
* the access attempt is considered to have failed,
* and we will print an error.
@@ -16581,8 +16337,8 @@
*/
rt2x00dev->led_mode =
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.h.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.h
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.h.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.h 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.h.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.h 2007-11-07 22:04:40.000000000 -0500
@@ -1082,8 +1082,8 @@
/*
* DMA descriptor defines.
@@ -16595,8 +16351,8 @@
/*
* TX descriptor format for TX, PRIO, ATIM and Beacon Ring.
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.c.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.c
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.c 2007-11-06 22:39:28.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.c.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.c 2007-11-07 22:04:40.000000000 -0500
@@ -52,8 +52,10 @@
* between each attampt. When the busy bit is still set at that time,
* the access attempt is considered to have failed,
@@ -17025,8 +16781,8 @@
ring->desc_size),
skb->len - ring->desc_size, control);
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c 2007-11-06 22:39:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c 2007-11-07 22:04:40.000000000 -0500
@@ -80,7 +80,7 @@ int rt2x00pci_write_tx_data(struct rt2x0
{
struct ieee80211_hdr *ieee80211hdr = (struct ieee80211_hdr *)skb->data;
@@ -17048,8 +16804,8 @@
while (1) {
diff -up linux-2.6.23.noarch/drivers/net/wireless/p54common.c.orig linux-2.6.23.noarch/drivers/net/wireless/p54common.c
---- linux-2.6.23.noarch/drivers/net/wireless/p54common.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/p54common.c 2007-11-06 22:39:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/p54common.c.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/p54common.c 2007-11-07 22:04:40.000000000 -0500
@@ -374,7 +374,7 @@ static void p54_rx_frame_sent(struct iee
if ((entry_hdr->magic1 & cpu_to_le16(0x4000)) != 0)
pad = entry_data->align[0];
@@ -17060,8 +16816,8 @@
status.flags |= IEEE80211_TX_STATUS_ACK;
else
diff -up linux-2.6.23.noarch/drivers/net/wireless/orinoco.h.orig linux-2.6.23.noarch/drivers/net/wireless/orinoco.h
---- linux-2.6.23.noarch/drivers/net/wireless/orinoco.h.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/orinoco.h 2007-11-06 22:39:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/orinoco.h.orig 2007-11-07 21:55:46.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/orinoco.h 2007-11-07 22:04:40.000000000 -0500
@@ -36,6 +36,12 @@ typedef enum {
FIRMWARE_TYPE_SYMBOL
} fwtype_t;
@@ -17091,8 +16847,8 @@
#ifdef ORINOCO_DEBUG
diff -up linux-2.6.23.noarch/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c.orig linux-2.6.23.noarch/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c
---- linux-2.6.23.noarch/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c 2007-11-06 22:39:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c.orig 2007-11-07 21:55:46.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c 2007-11-07 22:04:40.000000000 -0500
@@ -403,7 +403,7 @@ static int uw2453_init_hw(struct zd_rf *
if (r)
return r;
@@ -17103,8 +16859,8 @@
"PLL locked on configuration %d\n", i);
found_config = i;
diff -up linux-2.6.23.noarch/drivers/net/wireless/airo.c.orig linux-2.6.23.noarch/drivers/net/wireless/airo.c
---- linux-2.6.23.noarch/drivers/net/wireless/airo.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/airo.c 2007-11-06 22:39:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/airo.c.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/airo.c 2007-11-07 22:04:40.000000000 -0500
@@ -6417,7 +6417,7 @@ static int airo_set_encode(struct net_de
set_wep_key(local, index, NULL, 0, perm, 1);
} else
@@ -17115,8 +16871,8 @@
}
}
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/wext.c.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/wext.c
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/wext.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/wext.c 2007-11-06 22:39:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/wext.c.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/wext.c 2007-11-07 22:04:40.000000000 -0500
@@ -21,6 +21,24 @@
#include "assoc.h"
@@ -17258,8 +17014,8 @@
mutex_unlock(&adapter->lock);
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/assoc.h.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/assoc.h
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/assoc.h.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/assoc.h 2007-11-06 22:39:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/assoc.h.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/assoc.h 2007-11-07 22:04:40.000000000 -0500
@@ -11,22 +11,4 @@ struct assoc_request * wlan_get_associat
void libertas_sync_channel(struct work_struct *work);
@@ -17284,8 +17040,8 @@
-
#endif /* _WLAN_ASSOC_H */
diff -up linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_mgt.c.orig linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_mgt.c
---- linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_mgt.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_mgt.c 2007-11-06 22:39:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_mgt.c.orig 2007-11-07 21:55:46.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_mgt.c 2007-11-07 22:04:40.000000000 -0500
@@ -460,7 +460,7 @@ islpci_mgt_transaction(struct net_device
*recvframe = NULL;
@@ -17305,8 +17061,8 @@
}
diff -up linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_dev.h.orig linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_dev.h
---- linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_dev.h.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_dev.h 2007-11-06 22:39:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_dev.h.orig 2007-11-07 21:55:46.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_dev.h 2007-11-07 22:04:40.000000000 -0500
@@ -26,6 +26,7 @@
#include <linux/wireless.h>
#include <net/iw_handler.h>
@@ -17325,8 +17081,8 @@
wait_queue_head_t mgmt_wqueue; /* waitqueue for mbox */
diff -up linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_dev.c.orig linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_dev.c
---- linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_dev.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_dev.c 2007-11-06 22:39:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_dev.c.orig 2007-11-07 21:55:46.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/prism54/islpci_dev.c 2007-11-07 22:04:40.000000000 -0500
@@ -862,7 +862,7 @@ islpci_setup(struct pci_dev *pdev)
init_waitqueue_head(&priv->reset_done);
@@ -17337,8 +17093,8 @@
init_waitqueue_head(&priv->mgmt_wqueue);
sema_init(&priv->stats_sem, 1);
diff -up linux-2.6.23.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig linux-2.6.23.noarch/drivers/net/wireless/prism54/isl_ioctl.c
---- linux-2.6.23.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/prism54/isl_ioctl.c 2007-11-06 22:39:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/prism54/isl_ioctl.c 2007-11-07 22:04:40.000000000 -0500
@@ -1118,7 +1118,7 @@ prism54_set_encode(struct net_device *nd
mgt_set_request(priv, DOT11_OID_DEFKEYID, 0,
&index);
@@ -17358,8 +17114,8 @@
return -EINVAL;
}
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43legacy/Kconfig.orig linux-2.6.23.noarch/drivers/net/wireless/b43legacy/Kconfig
---- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/Kconfig.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/Kconfig 2007-11-06 22:39:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/Kconfig.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/Kconfig 2007-11-07 22:04:40.000000000 -0500
@@ -34,6 +34,18 @@ config B43LEGACY_PCICORE_AUTOSELECT
select SSB_DRIVER_PCICORE
default y
@@ -17380,8 +17136,8 @@
bool "Broadcom 43xx-legacy debugging"
depends on B43LEGACY
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig linux-2.6.23.noarch/drivers/net/wireless/b43legacy/b43legacy.h
---- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/b43legacy.h 2007-11-06 22:39:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/b43legacy.h 2007-11-07 22:04:40.000000000 -0500
@@ -19,6 +19,7 @@
#include "debugfs.h"
@@ -17415,8 +17171,8 @@
/* Reason code of the last interrupt. */
u32 irq_reason;
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43legacy/Makefile.orig linux-2.6.23.noarch/drivers/net/wireless/b43legacy/Makefile
---- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/Makefile.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/Makefile 2007-11-06 22:39:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/Makefile.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/Makefile 2007-11-07 22:04:40.000000000 -0500
@@ -1,14 +1,19 @@
-obj-$(CONFIG_B43LEGACY) += b43legacy.o
-b43legacy-obj-$(CONFIG_B43LEGACY_DEBUG) += debugfs.o
@@ -17450,8 +17206,8 @@
- xmit.o \
- $(b43legacy-obj-y)
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43legacy/main.c.orig linux-2.6.23.noarch/drivers/net/wireless/b43legacy/main.c
---- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/main.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/main.c 2007-11-06 22:39:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/main.c.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/main.c 2007-11-07 22:04:40.000000000 -0500
@@ -83,10 +83,6 @@ static int modparam_long_retry = B43lega
module_param_named(long_retry, modparam_long_retry, int, 0444);
MODULE_PARM_DESC(long_retry, "Long-Retry-Limit (0 - 15)");
@@ -17789,7 +17545,7 @@
static void b43legacy_configure_filter(struct ieee80211_hw *hw,
unsigned int changed,
unsigned int *fflags,
-@@ -3043,11 +2945,15 @@ static void b43legacy_wireless_core_exit
+@@ -3046,11 +2948,15 @@ static void b43legacy_wireless_core_exit
cancel_work_sync(&dev->restart_work);
mutex_lock(&wl->mutex);
@@ -17806,7 +17562,7 @@
b43legacy_switch_analog(dev, 0);
if (phy->dyn_tssi_tbl)
kfree(phy->tssi2dbm);
-@@ -3215,6 +3121,7 @@ static int b43legacy_wireless_core_init(
+@@ -3218,6 +3124,7 @@ static int b43legacy_wireless_core_init(
memset(wl->mac_addr, 0, ETH_ALEN);
b43legacy_upload_card_macaddress(dev);
b43legacy_security_init(dev);
@@ -17814,7 +17570,7 @@
b43legacy_rng_init(wl);
b43legacy_set_status(dev, B43legacy_STAT_INITIALIZED);
-@@ -3351,7 +3258,6 @@ static const struct ieee80211_ops b43leg
+@@ -3354,7 +3261,6 @@ static const struct ieee80211_ops b43leg
.remove_interface = b43legacy_remove_interface,
.config = b43legacy_dev_config,
.config_interface = b43legacy_config_interface,
@@ -17822,7 +17578,7 @@
.configure_filter = b43legacy_configure_filter,
.get_stats = b43legacy_get_stats,
.get_tx_stats = b43legacy_get_tx_stats,
-@@ -3454,6 +3360,7 @@ static int b43legacy_setup_modes(struct
+@@ -3457,6 +3363,7 @@ static int b43legacy_setup_modes(struct
static void b43legacy_wireless_core_detach(struct b43legacy_wldev *dev)
{
@@ -17830,7 +17586,7 @@
/* We release firmware that late to not be required to re-request
* is all the time when we reinit the core. */
b43legacy_release_firmware(dev);
-@@ -3494,18 +3401,13 @@ static int b43legacy_wireless_core_attac
+@@ -3497,18 +3404,13 @@ static int b43legacy_wireless_core_attac
else
have_bphy = 1;
@@ -17850,7 +17606,7 @@
/* Check if this device supports multiband. */
if (!pdev ||
(pdev->device != 0x4312 &&
-@@ -3531,17 +3433,18 @@ static int b43legacy_wireless_core_attac
+@@ -3534,17 +3436,18 @@ static int b43legacy_wireless_core_attac
err = b43legacy_validate_chipaccess(dev);
if (err)
@@ -17872,7 +17628,7 @@
b43legacy_switch_analog(dev, 0);
ssb_device_disable(dev->dev, 0);
ssb_bus_may_powerdown(bus);
-@@ -3549,8 +3452,6 @@ static int b43legacy_wireless_core_attac
+@@ -3552,8 +3455,6 @@ static int b43legacy_wireless_core_attac
out:
return err;
@@ -17882,8 +17638,8 @@
ssb_bus_may_powerdown(bus);
return err;
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43legacy/radio.c.orig linux-2.6.23.noarch/drivers/net/wireless/b43legacy/radio.c
---- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/radio.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/radio.c 2007-11-06 22:39:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/radio.c.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/radio.c 2007-11-07 22:04:40.000000000 -0500
@@ -2113,21 +2113,25 @@ void b43legacy_radio_turn_on(struct b43l
B43legacy_BUG_ON(1);
}
@@ -17924,8 +17680,8 @@
void b43legacy_radio_clear_tssi(struct b43legacy_wldev *dev)
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.c.orig linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.c
---- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.c 2007-11-06 22:39:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.c.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.c 2007-11-07 22:04:40.000000000 -0500
@@ -1,13 +1,13 @@
/*
@@ -18392,8 +18148,8 @@
+ b43legacy_unregister_led(&dev->led_assoc);
}
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43legacy/radio.h.orig linux-2.6.23.noarch/drivers/net/wireless/b43legacy/radio.h
---- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/radio.h.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/radio.h 2007-11-06 22:39:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/radio.h.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/radio.h 2007-11-07 22:04:40.000000000 -0500
@@ -61,7 +61,7 @@ void b43legacy_radio_write16(struct b43l
u16 b43legacy_radio_init2050(struct b43legacy_wldev *dev);
@@ -18405,7 +18161,7 @@
int synthetic_pu_workaround);
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/b43legacy/rfkill.h
--- /dev/null 2007-10-26 17:27:29.928203379 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/rfkill.h 2007-11-06 22:39:29.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/rfkill.h 2007-11-07 22:04:40.000000000 -0500
@@ -0,0 +1,59 @@
+#ifndef B43legacy_RFKILL_H_
+#define B43legacy_RFKILL_H_
@@ -18467,8 +18223,8 @@
+
+#endif /* B43legacy_RFKILL_H_ */
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.h.orig linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.h
---- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.h.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.h 2007-11-06 22:39:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.h.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/leds.h 2007-11-07 22:04:40.000000000 -0500
@@ -1,30 +1,33 @@
#ifndef B43legacy_LEDS_H_
#define B43legacy_LEDS_H_
@@ -18557,7 +18313,7 @@
#endif /* B43legacy_LEDS_H_ */
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/b43legacy/rfkill.c
--- /dev/null 2007-10-26 17:27:29.928203379 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/rfkill.c 2007-11-06 22:39:29.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/rfkill.c 2007-11-07 22:04:40.000000000 -0500
@@ -0,0 +1,185 @@
+/*
+
@@ -18745,8 +18501,8 @@
+ rfk->rfkill = NULL;
+}
diff -up linux-2.6.23.noarch/drivers/net/wireless/orinoco.c.orig linux-2.6.23.noarch/drivers/net/wireless/orinoco.c
---- linux-2.6.23.noarch/drivers/net/wireless/orinoco.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/orinoco.c 2007-11-06 22:39:29.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/orinoco.c.orig 2007-11-07 21:55:46.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/orinoco.c 2007-11-07 22:04:40.000000000 -0500
@@ -270,6 +270,37 @@ static inline void set_port_type(struct
}
}
@@ -19398,8 +19154,8 @@
return err;
}
diff -up linux-2.6.23.noarch/net/ieee80211/ieee80211_wx.c.orig linux-2.6.23.noarch/net/ieee80211/ieee80211_wx.c
---- linux-2.6.23.noarch/net/ieee80211/ieee80211_wx.c.orig 2007-11-06 22:39:02.000000000 -0500
-+++ linux-2.6.23.noarch/net/ieee80211/ieee80211_wx.c 2007-11-06 22:39:29.000000000 -0500
+--- linux-2.6.23.noarch/net/ieee80211/ieee80211_wx.c.orig 2007-11-07 21:55:46.000000000 -0500
++++ linux-2.6.23.noarch/net/ieee80211/ieee80211_wx.c 2007-11-07 22:04:40.000000000 -0500
@@ -708,7 +708,7 @@ int ieee80211_wx_get_encodeext(struct ie
} else
idx = ieee->tx_keyidx;
@@ -19410,8 +19166,8 @@
if (idx != 0 || ieee->iw_mode != IW_MODE_INFRA)
return -EINVAL;
diff -up linux-2.6.23.noarch/net/mac80211/ieee80211_ioctl.c.orig linux-2.6.23.noarch/net/mac80211/ieee80211_ioctl.c
---- linux-2.6.23.noarch/net/mac80211/ieee80211_ioctl.c.orig 2007-11-06 22:38:35.000000000 -0500
-+++ linux-2.6.23.noarch/net/mac80211/ieee80211_ioctl.c 2007-11-06 22:39:45.000000000 -0500
+--- linux-2.6.23.noarch/net/mac80211/ieee80211_ioctl.c.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/net/mac80211/ieee80211_ioctl.c 2007-11-07 22:04:40.000000000 -0500
@@ -633,22 +633,35 @@ static int ieee80211_ioctl_siwtxpower(st
{
struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
@@ -19453,8 +19209,8 @@
ieee80211_hw_config(local);
/* The return value of hw_config is not of big interest here,
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-11-06 22:38:35.000000000 -0500
-+++ linux-2.6.23.noarch/include/linux/ieee80211.h 2007-11-06 22:39:45.000000000 -0500
+--- linux-2.6.23.noarch/include/linux/ieee80211.h.orig 2007-11-07 21:55:59.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/ieee80211.h 2007-11-07 22:04:40.000000000 -0500
@@ -81,18 +81,18 @@
linux-2.6-wireless.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.10.8.4 -r 1.10.8.5 linux-2.6-wireless.patch
Index: linux-2.6-wireless.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-wireless.patch,v
retrieving revision 1.10.8.4
retrieving revision 1.10.8.5
diff -u -r1.10.8.4 -r1.10.8.5
--- linux-2.6-wireless.patch 7 Nov 2007 13:32:12 -0000 1.10.8.4
+++ linux-2.6-wireless.patch 8 Nov 2007 03:15:08 -0000 1.10.8.5
@@ -1,6 +1,6 @@
diff -up linux-2.6.23.noarch/drivers/Kconfig.orig linux-2.6.23.noarch/drivers/Kconfig
---- linux-2.6.23.noarch/drivers/Kconfig.orig 2007-11-07 08:08:53.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/Kconfig 2007-11-07 08:09:38.000000000 -0500
+--- linux-2.6.23.noarch/drivers/Kconfig.orig 2007-11-07 21:34:15.000000000 -0500
++++ linux-2.6.23.noarch/drivers/Kconfig 2007-11-07 21:34:29.000000000 -0500
@@ -58,6 +58,8 @@ source "drivers/power/Kconfig"
source "drivers/hwmon/Kconfig"
@@ -12,7 +12,7 @@
source "drivers/media/Kconfig"
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/ssb_private.h
--- /dev/null 2007-10-26 17:27:29.928203379 -0400
-+++ linux-2.6.23.noarch/drivers/ssb/ssb_private.h 2007-11-07 08:09:38.000000000 -0500
++++ linux-2.6.23.noarch/drivers/ssb/ssb_private.h 2007-11-07 21:34:29.000000000 -0500
@@ -0,0 +1,136 @@
+#ifndef LINUX_SSB_PRIVATE_H_
+#define LINUX_SSB_PRIVATE_H_
@@ -152,7 +152,7 @@
+#endif /* LINUX_SSB_PRIVATE_H_ */
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/driver_extif.c
--- /dev/null 2007-10-26 17:27:29.928203379 -0400
-+++ linux-2.6.23.noarch/drivers/ssb/driver_extif.c 2007-11-07 08:09:38.000000000 -0500
++++ linux-2.6.23.noarch/drivers/ssb/driver_extif.c 2007-11-07 21:34:29.000000000 -0500
@@ -0,0 +1,129 @@
+/*
+ * Sonics Silicon Backplane
@@ -285,7 +285,7 @@
+
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/scan.c
--- /dev/null 2007-10-26 17:27:29.928203379 -0400
-+++ linux-2.6.23.noarch/drivers/ssb/scan.c 2007-11-07 08:09:38.000000000 -0500
++++ linux-2.6.23.noarch/drivers/ssb/scan.c 2007-11-07 21:34:29.000000000 -0500
@@ -0,0 +1,413 @@
+/*
+ * Sonics Silicon Backplane
@@ -702,7 +702,7 @@
+}
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/driver_pcicore.c
--- /dev/null 2007-10-26 17:27:29.928203379 -0400
-+++ linux-2.6.23.noarch/drivers/ssb/driver_pcicore.c 2007-11-07 08:09:38.000000000 -0500
++++ linux-2.6.23.noarch/drivers/ssb/driver_pcicore.c 2007-11-07 21:34:29.000000000 -0500
@@ -0,0 +1,576 @@
+/*
+ * Sonics Silicon Backplane
@@ -1282,7 +1282,7 @@
+EXPORT_SYMBOL(ssb_pcicore_dev_irqvecs_enable);
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/driver_chipcommon.c
--- /dev/null 2007-10-26 17:27:29.928203379 -0400
-+++ linux-2.6.23.noarch/drivers/ssb/driver_chipcommon.c 2007-11-07 08:09:38.000000000 -0500
++++ linux-2.6.23.noarch/drivers/ssb/driver_chipcommon.c 2007-11-07 21:34:29.000000000 -0500
@@ -0,0 +1,445 @@
+/*
+ * Sonics Silicon Backplane
@@ -1731,7 +1731,7 @@
+#endif /* CONFIG_SSB_SERIAL */
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c
--- /dev/null 2007-10-26 17:27:29.928203379 -0400
-+++ linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c 2007-11-07 08:09:38.000000000 -0500
++++ linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c 2007-11-07 21:34:29.000000000 -0500
@@ -0,0 +1,48 @@
+/*
+ * Broadcom 43xx PCI-SSB bridge module
@@ -1783,7 +1783,7 @@
+}
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/Kconfig
--- /dev/null 2007-10-26 17:27:29.928203379 -0400
-+++ linux-2.6.23.noarch/drivers/ssb/Kconfig 2007-11-07 08:09:38.000000000 -0500
++++ linux-2.6.23.noarch/drivers/ssb/Kconfig 2007-11-07 21:34:29.000000000 -0500
@@ -0,0 +1,117 @@
+menu "Sonics Silicon Backplane"
+
@@ -1904,7 +1904,7 @@
+endmenu
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/pci.c
--- /dev/null 2007-10-26 17:27:29.928203379 -0400
-+++ linux-2.6.23.noarch/drivers/ssb/pci.c 2007-11-07 08:09:38.000000000 -0500
++++ linux-2.6.23.noarch/drivers/ssb/pci.c 2007-11-07 21:34:29.000000000 -0500
@@ -0,0 +1,740 @@
+/*
+ * Sonics Silicon Backplane PCI-Hostbus related functions.
@@ -2648,7 +2648,7 @@
+}
diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/pcmcia.c
--- /dev/null 2007-10-26 17:27:29.928203379 -0400
-+++ linux-2.6.23.noarch/drivers/ssb/pcmcia.c 2007-11-07 08:09:38.000000000 -0500
++++ linux-2.6.23.noarch/drivers/ssb/pcmcia.c 2007-11-07 21:34:49.000000000 -0500
@@ -0,0 +1,271 @@
+/*
+ * Sonics Silicon Backplane
@@ -2714,17 +2714,17 @@
+ err = pcmcia_access_configuration_register(pdev, ®);
+ if (err != CS_SUCCESS)
+ goto error;
-+ read_addr |= (reg.Value & 0xF) << 12;
++ read_addr |= ((u32)(reg.Value & 0x0F)) << 12;
+ reg.Offset = 0x30;
+ err = pcmcia_access_configuration_register(pdev, ®);
+ if (err != CS_SUCCESS)
+ goto error;
-+ read_addr |= reg.Value << 16;
++ read_addr |= ((u32)reg.Value) << 16;
+ reg.Offset = 0x32;
+ err = pcmcia_access_configuration_register(pdev, ®);
+ if (err != CS_SUCCESS)
+ goto error;
-+ read_addr |= reg.Value << 24;
++ read_addr |= ((u32)reg.Value) << 24;
+
+ cur_core = (read_addr - SSB_ENUM_BASE) / SSB_CORE_SIZE;
+ if (cur_core == coreidx)
@@ -2803,28 +2803,29 @@
+ goto out_unlock;
+}
+
-+/* These are the main device register access functions.
-+ * do_select_core is inline to have the likely hotpath inline.
-+ * All unlikely codepaths are out-of-line. */
-+static inline int do_select_core(struct ssb_bus *bus,
-+ struct ssb_device *dev,
-+ u16 *offset)
++static int select_core_and_segment(struct ssb_device *dev,
++ u16 *offset)
+{
++ struct ssb_bus *bus = dev->bus;
+ int err;
-+ u8 need_seg = (*offset >= 0x800) ? 1 : 0;
++ u8 need_segment;
++
++ if (*offset >= 0x800) {
++ *offset -= 0x800;
++ need_segment = 1;
++ } else
++ need_segment = 0;
+
+ if (unlikely(dev != bus->mapped_device)) {
+ err = ssb_pcmcia_switch_core(bus, dev);
+ if (unlikely(err))
+ return err;
+ }
-+ if (unlikely(need_seg != bus->mapped_pcmcia_seg)) {
-+ err = ssb_pcmcia_switch_segment(bus, need_seg);
++ if (unlikely(need_segment != bus->mapped_pcmcia_seg)) {
++ err = ssb_pcmcia_switch_segment(bus, need_segment);
+ if (unlikely(err))
+ return err;
+ }
-+ if (need_seg == 1)
-+ *offset -= 0x800;
+
+ return 0;
+}
@@ -2832,32 +2833,31 @@
+static u16 ssb_pcmcia_read16(struct ssb_device *dev, u16 offset)
+{
+ struct ssb_bus *bus = dev->bus;
-+ u16 x;
+
-+ if (unlikely(do_select_core(bus, dev, &offset)))
++ if (unlikely(select_core_and_segment(dev, &offset)))
+ return 0xFFFF;
-+ x = readw(bus->mmio + offset);
+
-+ return x;
++ return readw(bus->mmio + offset);
+}
+
+static u32 ssb_pcmcia_read32(struct ssb_device *dev, u16 offset)
+{
+ struct ssb_bus *bus = dev->bus;
-+ u32 x;
++ u32 lo, hi;
+
-+ if (unlikely(do_select_core(bus, dev, &offset)))
++ if (unlikely(select_core_and_segment(dev, &offset)))
+ return 0xFFFFFFFF;
-+ x = readl(bus->mmio + offset);
++ lo = readw(bus->mmio + offset);
++ hi = readw(bus->mmio + offset + 2);
+
-+ return x;
++ return (lo | (hi << 16));
+}
+
+static void ssb_pcmcia_write16(struct ssb_device *dev, u16 offset, u16 value)
+{
+ struct ssb_bus *bus = dev->bus;
+
-+ if (unlikely(do_select_core(bus, dev, &offset)))
++ if (unlikely(select_core_and_segment(dev, &offset)))
+ return;
+ writew(value, bus->mmio + offset);
[...2831 lines suppressed...]
@@ -133861,7 +133859,7 @@
+#endif /* LINUX_SSB_CHIPCO_H_ */
diff -up /dev/null linux-2.6.23.noarch/include/linux/ssb/ssb_driver_extif.h
--- /dev/null 2007-10-26 17:27:29.928203379 -0400
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb_driver_extif.h 2007-11-07 08:09:38.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb_driver_extif.h 2007-11-07 21:34:30.000000000 -0500
@@ -0,0 +1,204 @@
+/*
+ * Hardware-specific External Interface I/O core definitions
@@ -134069,7 +134067,7 @@
+#endif /* LINUX_SSB_EXTIFCORE_H_ */
diff -up /dev/null linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h
--- /dev/null 2007-10-26 17:27:29.928203379 -0400
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h 2007-11-07 08:09:38.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h 2007-11-07 21:34:30.000000000 -0500
@@ -0,0 +1,292 @@
+#ifndef LINUX_SSB_REGS_H_
+#define LINUX_SSB_REGS_H_
@@ -134365,7 +134363,7 @@
+#endif /* LINUX_SSB_REGS_H_ */
diff -up /dev/null linux-2.6.23.noarch/include/linux/ssb/ssb.h
--- /dev/null 2007-10-26 17:27:29.928203379 -0400
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb.h 2007-11-07 08:09:38.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb.h 2007-11-07 21:34:30.000000000 -0500
@@ -0,0 +1,424 @@
+#ifndef LINUX_SSB_H_
+#define LINUX_SSB_H_
@@ -134793,7 +134791,7 @@
+#endif /* LINUX_SSB_H_ */
diff -up /dev/null linux-2.6.23.noarch/include/linux/ssb/ssb_driver_mips.h
--- /dev/null 2007-10-26 17:27:29.928203379 -0400
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb_driver_mips.h 2007-11-07 08:09:38.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb_driver_mips.h 2007-11-07 21:34:30.000000000 -0500
@@ -0,0 +1,46 @@
+#ifndef LINUX_SSB_MIPSCORE_H_
+#define LINUX_SSB_MIPSCORE_H_
@@ -134843,7 +134841,7 @@
+#endif /* LINUX_SSB_MIPSCORE_H_ */
diff -up /dev/null linux-2.6.23.noarch/include/linux/ssb/ssb_driver_pci.h
--- /dev/null 2007-10-26 17:27:29.928203379 -0400
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb_driver_pci.h 2007-11-07 08:09:38.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb_driver_pci.h 2007-11-07 21:34:30.000000000 -0500
@@ -0,0 +1,106 @@
+#ifndef LINUX_SSB_PCICORE_H_
+#define LINUX_SSB_PCICORE_H_
@@ -134952,8 +134950,8 @@
+#endif /* CONFIG_SSB_DRIVER_PCICORE */
+#endif /* LINUX_SSB_PCICORE_H_ */
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-11-07 08:08:53.000000000 -0500
-+++ linux-2.6.23.noarch/include/linux/nl80211.h 2007-11-07 08:09:38.000000000 -0500
+--- linux-2.6.23.noarch/include/linux/nl80211.h.orig 2007-11-07 21:34:15.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/nl80211.h 2007-11-07 21:34:30.000000000 -0500
@@ -7,7 +7,97 @@
*/
@@ -135076,8 +135074,8 @@
#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-11-07 08:08:53.000000000 -0500
-+++ linux-2.6.23.noarch/include/linux/mod_devicetable.h 2007-11-07 08:09:38.000000000 -0500
+--- linux-2.6.23.noarch/include/linux/mod_devicetable.h.orig 2007-11-07 21:34:15.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/mod_devicetable.h 2007-11-07 21:34:30.000000000 -0500
@@ -340,4 +340,19 @@ struct parisc_device_id {
#define PA_HVERSION_ANY_ID 0xffff
#define PA_SVERSION_ANY_ID 0xffffffff
@@ -135099,8 +135097,8 @@
+
#endif /* LINUX_MOD_DEVICETABLE_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-11-07 08:08:53.000000000 -0500
-+++ linux-2.6.23.noarch/include/linux/rfkill.h 2007-11-07 08:10:51.000000000 -0500
+--- linux-2.6.23.noarch/include/linux/rfkill.h.orig 2007-11-07 21:34:15.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/rfkill.h 2007-11-07 21:34:30.000000000 -0500
@@ -2,7 +2,7 @@
#define __RFKILL_H
@@ -135183,8 +135181,8 @@
#endif /* RFKILL_H */
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-11-07 08:08:53.000000000 -0500
-+++ linux-2.6.23.noarch/Documentation/networking/mac80211-injection.txt 2007-11-07 08:09:38.000000000 -0500
+--- linux-2.6.23.noarch/Documentation/networking/mac80211-injection.txt.orig 2007-11-07 21:34:15.000000000 -0500
++++ linux-2.6.23.noarch/Documentation/networking/mac80211-injection.txt 2007-11-07 21:34:30.000000000 -0500
@@ -13,15 +13,35 @@ The radiotap format is discussed in
./Documentation/networking/radiotap-headers.txt.
@@ -135228,8 +135226,8 @@
Here is an example valid radiotap header defining these three parameters
diff -up linux-2.6.23.noarch/MAINTAINERS.orig linux-2.6.23.noarch/MAINTAINERS
---- linux-2.6.23.noarch/MAINTAINERS.orig 2007-11-07 08:08:53.000000000 -0500
-+++ linux-2.6.23.noarch/MAINTAINERS 2007-11-07 08:09:38.000000000 -0500
+--- linux-2.6.23.noarch/MAINTAINERS.orig 2007-11-07 21:34:15.000000000 -0500
++++ linux-2.6.23.noarch/MAINTAINERS 2007-11-07 21:34:46.000000000 -0500
@@ -284,6 +284,14 @@ M: corentin.labbe at geomatys.fr
L: lm-sensors at lm-sensors.org
S: Maintained
@@ -135245,7 +135243,7 @@
ADT746X FAN DRIVER
P: Colin Leroy
M: colin at colino.net
-@@ -787,6 +795,22 @@ L: linux-hams at vger.kernel.org
+@@ -787,11 +795,29 @@ L: linux-hams at vger.kernel.org
W: http://www.baycom.org/~tom/ham/ham.html
S: Maintained
@@ -135253,22 +135251,30 @@
+P: Michael Buesch
+M: mb at bu3sch.de
+P: Stefano Brivio
-+M: st3 at riseup.net
++M: stefano.brivio at polimi.it
+L: linux-wireless at vger.kernel.org
-+W: http://bcm43xx.berlios.de/
++W: http://linuxwireless.org/en/users/Drivers/b43
+S: Maintained
+
+B43LEGACY WIRELESS DRIVER
+P: Larry Finger
+M: Larry.Finger at lwfinger.net
++P: Stefano Brivio
++M: stefano.brivio at polimi.it
+L: linux-wireless at vger.kernel.org
-+W: http://bcm43xx.berlios.de/
++W: http://linuxwireless.org/en/users/Drivers/b43
+S: Maintained
+
BCM43XX WIRELESS DRIVER (SOFTMAC BASED VERSION)
P: Larry Finger
M: Larry.Finger at lwfinger.net
-@@ -2058,6 +2082,15 @@ L: http://lists.sourceforge.net/mailman/
+ P: Stefano Brivio
+-M: st3 at riseup.net
++M: stefano.brivio at polimi.it
+ L: linux-wireless at vger.kernel.org
+ W: http://bcm43xx.berlios.de/
+ S: Maintained
+@@ -2058,6 +2084,15 @@ L: http://lists.sourceforge.net/mailman/
W: http://ipw2200.sourceforge.net
S: Supported
@@ -135284,7 +135290,7 @@
IOC3 ETHERNET DRIVER
P: Ralf Baechle
M: ralf at linux-mips.org
-@@ -2419,13 +2452,15 @@ W: http://www.tazenda.demon.co.uk/phil/l
+@@ -2419,13 +2454,15 @@ W: http://www.tazenda.demon.co.uk/phil/l
S: Maintained
MAC80211
@@ -135303,7 +135309,7 @@
S: Maintained
MACVLAN DRIVER
-@@ -3019,6 +3054,14 @@ L: kpreempt-tech at lists.sourceforge.net
+@@ -3019,6 +3056,14 @@ L: kpreempt-tech at lists.sourceforge.net
W: ftp://ftp.kernel.org/pub/linux/kernel/people/rml/preempt-kernel
S: Supported
@@ -135318,7 +135324,7 @@
PRISM54 WIRELESS DRIVER
P: Luis R. Rodriguez
M: mcgrof at gmail.com
-@@ -3106,6 +3149,14 @@ M: corey at world.std.com
+@@ -3106,6 +3151,14 @@ M: corey at world.std.com
L: linux-wireless at vger.kernel.org
S: Maintained
@@ -135333,7 +135339,7 @@
RANDOM NUMBER DRIVER
P: Matt Mackall
M: mpm at selenic.com
-@@ -3390,15 +3441,10 @@ L: lm-sensors at lm-sensors.org
+@@ -3390,15 +3443,10 @@ L: lm-sensors at lm-sensors.org
S: Maintained
SOFTMAC LAYER (IEEE 802.11)
@@ -135350,7 +135356,7 @@
SOFTWARE RAID (Multiple Disks) SUPPORT
P: Ingo Molnar
-@@ -3430,6 +3476,12 @@ M: tsbogend at alpha.franken.de
+@@ -3430,6 +3478,12 @@ M: tsbogend at alpha.franken.de
L: netdev at vger.kernel.org
S: Maintained
@@ -135364,8 +135370,8 @@
P: Mattia Dongili
M: malattia at linux.it
diff -up linux-2.6.23.noarch/CREDITS.orig linux-2.6.23.noarch/CREDITS
---- linux-2.6.23.noarch/CREDITS.orig 2007-11-07 08:08:53.000000000 -0500
-+++ linux-2.6.23.noarch/CREDITS 2007-11-07 08:09:38.000000000 -0500
+--- linux-2.6.23.noarch/CREDITS.orig 2007-11-07 21:34:15.000000000 -0500
++++ linux-2.6.23.noarch/CREDITS 2007-11-07 21:34:30.000000000 -0500
@@ -665,6 +665,11 @@ D: Minor updates to SCSI types, added /p
S: (ask for current address)
S: USA
More information about the fedora-extras-commits
mailing list