rpms/kernel/devel linux-2.6-wireless-pending-too.patch, NONE, 1.1 kernel.spec, 1.348, 1.349 linux-2.6-wireless-pending.patch, 1.20, 1.21
John W. Linville (linville)
fedora-extras-commits at redhat.com
Wed Jan 9 16:58:59 UTC 2008
Author: linville
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13588
Modified Files:
kernel.spec linux-2.6-wireless-pending.patch
Added Files:
linux-2.6-wireless-pending-too.patch
Log Message:
A few more wireless bits destined for 2.6.25
linux-2.6-wireless-pending-too.patch:
--- NEW FILE linux-2.6-wireless-pending-too.patch ---
commit 6e800de90057baf13db333925fd7f60b8ce3ce5c
Author: Michael Buesch <mb at bu3sch.de>
Date: Mon Jan 7 12:55:14 2008 +0100
b43: Add N-PHY related initvals firmware filenames.
This adds the initval filenames for the N-PHY firmware.
Signed-off-by: Michael Buesch <mb at bu3sch.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit b6fe1a29bc20dcbb1cfb0c08c1445c8c7efcca4a
Author: Michael Buesch <mb at bu3sch.de>
Date: Thu Dec 27 22:15:11 2007 +0100
b43: Fix tim search buffer overrun
Use the length of the variable section of the beacon instead of the
whole beacon length for bounds checking.
Signed-off-by: Michael Buesch <mb at bu3sch.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 8c695644e98abe9161353911e96c46d29f083602
Author: Michael Buesch <mb at bu3sch.de>
Date: Wed Dec 26 18:26:17 2007 +0100
b43: Put multicast frames on the mcast queue
This queues frames flagged as "send after DTIM" by mac80211
on the special multicast queue. The firmware will take care
to send the packet after the DTIM.
Signed-off-by: Michael Buesch <mb at bu3sch.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit a3a783dbab5b4d5658853a63173de36fa1ceba4e
Author: Michael Buesch <mb at bu3sch.de>
Date: Wed Dec 26 18:04:14 2007 +0100
b43: Fix template upload locking.
This fixes the template upload locking.
Signed-off-by: Michael Buesch <mb at bu3sch.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 7837a7248fd2a9ca024672fad13d78fb96b509c4
Author: Michael Buesch <mb at bu3sch.de>
Date: Wed Dec 26 17:47:10 2007 +0100
b43: Fix upload of beacon packets to the hardware
This fixes uploading of the beacon data and writing of the
TIM and DTIM offsets.
Signed-off-by: Michael Buesch <mb at bu3sch.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 05ed2e2a9f0ca366e6485cd449e15d811d5824f4
Author: Johannes Berg <johannes at sipsolutions.net>
Date: Fri Dec 28 14:32:58 2007 +0100
mac80211: add unified BSS configuration
This patch (based on Ron Rindjunsky's) creates a framework for
a unified way to pass BSS configuration to drivers that require
the information, e.g. for implementing power save mode.
This patch introduces new ieee80211_bss_conf structure that is
passed to the driver via the new bss_info_changed() callback
when the BSS configuration changes.
This new BSS configuration infrastructure adds the following
new features:
* drivers are notified of their association AID
* drivers are notified of association status
and replaces the erp_ie_changed() callback. The patch also does
the relevant driver updates for the latter change.
Signed-off-by: Ron Rindjunsky <ron.rindjunsky at intel.com>
Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 485df9d39dfb4f605112eaada132fe5cfe9cb4cf
Author: Michael Wu <flamingice at sourmilk.net>
Date: Tue Dec 25 19:33:16 2007 -0500
mac80211: Fix rate reporting regression
Mattias Nissler's "clean up rate selection" patch incorrectly changes
the behavior of txrate setting in sta_info. This patch backs out parts
of the rate selection consolidation in order to fix this issue for now.
Signed-off-by: Michael Wu <flamingice at sourmilk.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 50877fc64e189084730b427fc368d5baea3843bc
Author: Ron Rindjunsky <ron.rindjunsky at intel.com>
Date: Tue Dec 25 17:00:38 2007 +0200
iwlwifi: A-MPDU Rx flow enabled
This patch enables the A-MPDU Rx flow. it contains several
adjustments to new mac80211 A-MPDU Rx flow.
Signed-off-by: Ron Rindjunsky <ron.rindjunsky at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 53f048e222c934188bab5a32322d8a26ad641def
Author: Luis R. Rodriguez <mcgrof at gmail.com>
Date: Fri Jan 4 02:21:05 2008 -0500
ath5k: Fix frame duration oops
This patch fixes an oops which was introduced as a regression by
commit fd640775bd16e1df50c867cc547af0, on the patch titled,
"mac80211: dont use interface indices in drivers".
ieee80211_generic_frame_duration() now relies on sdata->flags which
itself gets set upon bringing the interface up. We check for the
virtual interface now before setting the rate duration registers.
After the mode changes are introduced onto mac80211 we should revisit
these changes.
This patch was tested on the following cards:
1) BG card:
Atheros AR5213A chip found (MAC: 0x59, PHY: 0x43)
RF2112A 2GHz radio found (0x46)
2) ABG card:
Atheros AR5213A chip found (MAC: 0x59,PHY: 0x43)
RF5112A multiband radio found (0x36)
Signed-off-by: Luis R. Rodriguez <mcgrof at winlab.rutgers.edu>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 072ab827589fea779ef985a58a3df8b4000d86e4
Author: Johannes Berg <johannes at sipsolutions.net>
Date: Wed Dec 19 02:03:35 2007 +0100
mac80211: implement cfg80211 station handling
This implements station handling from userspace via cfg80211
in mac80211.
Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit d0196ba509aec362ce64c5abe556d194543460fc
Author: Johannes Berg <johannes at sipsolutions.net>
Date: Wed Dec 19 02:03:33 2007 +0100
mac80211: add beacon configuration via cfg80211
This patch implements the cfg80211 hooks for configuring beaconing
on an access point interface in mac80211. While doing so, it fixes
a number of races that could badly crash the machine when the
beacon is changed while being requested by the driver.
Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit f0ff12a38ebef5d337fee1163d6b1af12bea06ea
Author: Johannes Berg <johannes at sipsolutions.net>
Date: Wed Dec 19 01:31:27 2007 +0100
mac80211: move interface type to vif structure
Drivers that support mixed AP/STA operation may well need to
know the type of a virtual interface when iterating over them.
The easiest way to support that is to move the interface type
variable into the vif structure.
Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit a412b81a63d76d071bddcb0b24c04168a8b3bf0a
Author: Johannes Berg <johannes at sipsolutions.net>
Date: Wed Dec 19 01:31:26 2007 +0100
mac80211: dont use interface indices in drivers
This patch gets rid of the if_id stuff where possible in favour of
a new per-virtual-interface structure "struct ieee80211_vif". This
structure is located at the end of the per-interface structure and
contains a variable length driver-use data area.
This has two advantages:
* removes the need to look up interfaces by if_id, this is better
for working with network namespaces and performance
* allows drivers to store and retrieve per-interface data without
having to allocate own lists/hash tables
[...4254 lines suppressed...]
memcpy(&intf->bssid, conf->mac_addr, ETH_ALEN);
@@ -265,7 +265,8 @@ int rt2x00mac_config(struct ieee80211_hw
}
EXPORT_SYMBOL_GPL(rt2x00mac_config);
-int rt2x00mac_config_interface(struct ieee80211_hw *hw, int if_id,
+int rt2x00mac_config_interface(struct ieee80211_hw *hw,
+ struct ieee80211_vif *vif,
struct ieee80211_if_conf *conf)
{
struct rt2x00_dev *rt2x00dev = hw->priv;
@@ -341,23 +342,27 @@ int rt2x00mac_get_tx_stats(struct ieee80
}
EXPORT_SYMBOL_GPL(rt2x00mac_get_tx_stats);
-void rt2x00mac_erp_ie_changed(struct ieee80211_hw *hw, u8 changes,
- int cts_protection, int preamble)
+void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw,
+ struct ieee80211_vif *vif,
+ struct ieee80211_bss_conf *bss_conf,
+ u32 changes)
{
struct rt2x00_dev *rt2x00dev = hw->priv;
int short_preamble;
int ack_timeout;
int ack_consume_time;
int difs;
+ int preamble;
/*
* We only support changing preamble mode.
*/
- if (!(changes & IEEE80211_ERP_CHANGE_PREAMBLE))
+ if (!(changes & BSS_CHANGED_ERP_PREAMBLE))
return;
- short_preamble = !preamble;
- preamble = !!(preamble) ? PREAMBLE : SHORT_PREAMBLE;
+ short_preamble = bss_conf->use_short_preamble;
+ preamble = bss_conf->use_short_preamble ?
+ SHORT_PREAMBLE : PREAMBLE;
difs = (hw->conf.flags & IEEE80211_CONF_SHORT_SLOT_TIME) ?
SHORT_DIFS : DIFS;
@@ -373,7 +378,7 @@ void rt2x00mac_erp_ie_changed(struct iee
rt2x00dev->ops->lib->config_preamble(rt2x00dev, short_preamble,
ack_timeout, ack_consume_time);
}
-EXPORT_SYMBOL_GPL(rt2x00mac_erp_ie_changed);
+EXPORT_SYMBOL_GPL(rt2x00mac_bss_info_changed);
int rt2x00mac_conf_tx(struct ieee80211_hw *hw, int queue,
const struct ieee80211_tx_queue_params *params)
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 2008-01-09 11:04:05.000000000 -0500
+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.c 2008-01-09 11:28:46.000000000 -0500
@@ -1835,7 +1835,7 @@ static const struct ieee80211_ops rt2500
.configure_filter = rt2500pci_configure_filter,
.get_stats = rt2x00mac_get_stats,
.set_retry_limit = rt2500pci_set_retry_limit,
- .erp_ie_changed = rt2x00mac_erp_ie_changed,
+ .bss_info_changed = rt2x00mac_bss_info_changed,
.conf_tx = rt2x00mac_conf_tx,
.get_tx_stats = rt2x00mac_get_tx_stats,
.get_tsf = rt2500pci_get_tsf,
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 2008-01-09 11:04:05.000000000 -0500
+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.c 2008-01-09 11:28:46.000000000 -0500
@@ -2442,7 +2442,7 @@ static const struct ieee80211_ops rt61pc
.configure_filter = rt61pci_configure_filter,
.get_stats = rt2x00mac_get_stats,
.set_retry_limit = rt61pci_set_retry_limit,
- .erp_ie_changed = rt2x00mac_erp_ie_changed,
+ .bss_info_changed = rt2x00mac_bss_info_changed,
.conf_tx = rt2x00mac_conf_tx,
.get_tx_stats = rt2x00mac_get_tx_stats,
.get_tsf = rt61pci_get_tsf,
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 2008-01-09 11:04:05.000000000 -0500
+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.c 2008-01-09 11:28:46.000000000 -0500
@@ -2024,7 +2024,7 @@ static const struct ieee80211_ops rt73us
.configure_filter = rt73usb_configure_filter,
.get_stats = rt2x00mac_get_stats,
.set_retry_limit = rt73usb_set_retry_limit,
- .erp_ie_changed = rt2x00mac_erp_ie_changed,
+ .bss_info_changed = rt2x00mac_bss_info_changed,
.conf_tx = rt2x00mac_conf_tx,
.get_tx_stats = rt2x00mac_get_tx_stats,
.get_tsf = rt73usb_get_tsf,
diff -up linux-2.6.23.noarch/drivers/net/wireless/ath5k/hw.c.orig linux-2.6.23.noarch/drivers/net/wireless/ath5k/hw.c
--- linux-2.6.23.noarch/drivers/net/wireless/ath5k/hw.c.orig 2008-01-09 11:04:05.000000000 -0500
+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/hw.c 2008-01-09 11:28:46.000000000 -0500
@@ -533,7 +533,7 @@ static inline void ath5k_hw_write_rate_d
* ieee80211_duration() for a brief description of
* what rate we should choose to TX ACKs. */
tx_time = ieee80211_generic_frame_duration(sc->hw,
- sc->iface_id, 10, control_rate->rate_kbps/100);
+ sc->vif, 10, control_rate->rate_kbps/100);
ath5k_hw_reg_write(ah, tx_time, reg);
@@ -734,8 +734,12 @@ int ath5k_hw_reset(struct ath5k_hw *ah,
if (ret)
return ret;
- /* Write rate duration table */
- if (ah->ah_version == AR5K_AR5212)
+ /* Write rate duration table only on AR5212 and if
+ * virtual interface has already been brought up
+ * XXX: rethink this after new mode changes to
+ * mac80211 are integrated */
+ if (ah->ah_version == AR5K_AR5212 &&
+ ah->ah_sc->vif != NULL)
ath5k_hw_write_rate_duration(ah, driver_mode);
/*
diff -up linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.c.orig linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.c
--- linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-01-09 11:04:05.000000000 -0500
+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.c 2008-01-09 11:28:46.000000000 -0500
@@ -178,7 +178,8 @@ static void ath5k_remove_interface(struc
struct ieee80211_if_init_conf *conf);
static int ath5k_config(struct ieee80211_hw *hw,
struct ieee80211_conf *conf);
-static int ath5k_config_interface(struct ieee80211_hw *hw, int if_id,
+static int ath5k_config_interface(struct ieee80211_hw *hw,
+ struct ieee80211_vif *vif,
struct ieee80211_if_conf *conf);
static void ath5k_configure_filter(struct ieee80211_hw *hw,
unsigned int changed_flags,
@@ -2505,12 +2506,12 @@ static int ath5k_add_interface(struct ie
int ret;
mutex_lock(&sc->lock);
- if (sc->iface_id) {
+ if (sc->vif) {
ret = 0;
goto end;
}
- sc->iface_id = conf->if_id;
+ sc->vif = conf->vif;
switch (conf->type) {
case IEEE80211_IF_TYPE_STA:
@@ -2535,10 +2536,10 @@ ath5k_remove_interface(struct ieee80211_
struct ath5k_softc *sc = hw->priv;
mutex_lock(&sc->lock);
- if (sc->iface_id != conf->if_id)
+ if (sc->vif != conf->vif)
goto end;
- sc->iface_id = 0;
+ sc->vif = NULL;
end:
mutex_unlock(&sc->lock);
}
@@ -2556,7 +2557,7 @@ ath5k_config(struct ieee80211_hw *hw,
}
static int
-ath5k_config_interface(struct ieee80211_hw *hw, int if_id,
+ath5k_config_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
struct ieee80211_if_conf *conf)
{
struct ath5k_softc *sc = hw->priv;
@@ -2567,7 +2568,7 @@ ath5k_config_interface(struct ieee80211_
* be set to mac80211's value at ath5k_config(). */
sc->bintval = 1000 * 1000 / 1024;
mutex_lock(&sc->lock);
- if (sc->iface_id != if_id) {
+ if (sc->vif != vif) {
ret = -EIO;
goto unlock;
}
diff -up linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.h.orig linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.h
--- linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-01-09 11:04:05.000000000 -0500
+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.h 2008-01-09 11:28:46.000000000 -0500
@@ -123,7 +123,7 @@ struct ath5k_softc {
unsigned int curmode; /* current phy mode */
struct ieee80211_channel *curchan; /* current h/w channel */
- int iface_id; /* add/remove_interface id */
+ struct ieee80211_vif *vif;
struct {
u8 rxflags; /* radiotap rx flags */
diff -up linux-2.6.23.noarch/drivers/net/wireless/adm8211.c.orig linux-2.6.23.noarch/drivers/net/wireless/adm8211.c
--- linux-2.6.23.noarch/drivers/net/wireless/adm8211.c.orig 2008-01-09 11:04:05.000000000 -0500
+++ linux-2.6.23.noarch/drivers/net/wireless/adm8211.c 2008-01-09 11:28:46.000000000 -0500
@@ -1312,7 +1312,8 @@ static int adm8211_config(struct ieee802
return 0;
}
-static int adm8211_config_interface(struct ieee80211_hw *dev, int if_id,
+static int adm8211_config_interface(struct ieee80211_hw *dev,
+ struct ieee80211_vif *vif,
struct ieee80211_if_conf *conf)
{
struct adm8211_priv *priv = dev->priv;
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -r1.348 -r1.349
--- kernel.spec 9 Jan 2008 02:12:37 -0000 1.348
+++ kernel.spec 9 Jan 2008 16:58:18 -0000 1.349
@@ -622,6 +622,7 @@
Patch670: linux-2.6-ata-quirk.patch
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
@@ -1127,6 +1128,9 @@
# 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
+
# implement smarter atime updates support.
ApplyPatch linux-2.6-smarter-relatime.patch
@@ -1735,6 +1739,9 @@
%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
%changelog
+* Wed Jan 09 2008 John W. Linville <linville at redhat.com>
+- A few more wireless bits destined for 2.6.25
+
* Tue Jan 08 2008 John W. Linville <linville at redhat.com>
- More wireless fixes headed for 2.6.24
- More wireless updates headed for 2.6.25
linux-2.6-wireless-pending.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.20 -r 1.21 linux-2.6-wireless-pending.patch
Index: linux-2.6-wireless-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless-pending.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- linux-2.6-wireless-pending.patch 9 Jan 2008 02:12:37 -0000 1.20
+++ linux-2.6-wireless-pending.patch 9 Jan 2008 16:58:18 -0000 1.21
@@ -23,17 +23,6 @@
Signed-off-by: Miguel Botón <mboton at gmail.com
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit d285ab9bd9dd17662cc628fd402cc5ca6590e873
-Author: Michael Buesch <mb at bu3sch.de>
-Date: Mon Jan 7 12:55:14 2008 +0100
-
- b43: Add N-PHY related initvals firmware filenames.
-
- This adds the initval filenames for the N-PHY firmware.
-
- Signed-off-by: Michael Buesch <mb at bu3sch.de>
- Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
commit c6227910a3aa6ac87d82b8309282d574a10954f0
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sun Jan 6 23:42:21 2008 +0100
@@ -271,54 +260,6 @@
Signed-off-by: Miguel Botón <mboton at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit 7ed2cdc61c121f7dd9dc684eaf1540ce36e8987e
-Author: Michael Buesch <mb at bu3sch.de>
-Date: Thu Dec 27 22:15:11 2007 +0100
-
- b43: Fix tim search buffer overrun
-
- Use the length of the variable section of the beacon instead of the
- whole beacon length for bounds checking.
-
- Signed-off-by: Michael Buesch <mb at bu3sch.de>
- Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit f7e56cf2dc7ea33b423dc5a5436493249e39916a
-Author: Michael Buesch <mb at bu3sch.de>
-Date: Wed Dec 26 18:26:17 2007 +0100
-
- b43: Put multicast frames on the mcast queue
-
- This queues frames flagged as "send after DTIM" by mac80211
- on the special multicast queue. The firmware will take care
- to send the packet after the DTIM.
-
- Signed-off-by: Michael Buesch <mb at bu3sch.de>
- Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit 71eb4126d4387cc98756b0cef98bb454c0443d55
-Author: Michael Buesch <mb at bu3sch.de>
-Date: Wed Dec 26 18:04:14 2007 +0100
-
- b43: Fix template upload locking.
-
- This fixes the template upload locking.
-
- Signed-off-by: Michael Buesch <mb at bu3sch.de>
- Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
-commit 67e152fcc4a340d78ea8e8ab1a139a52288b06a3
-Author: Michael Buesch <mb at bu3sch.de>
-Date: Wed Dec 26 17:47:10 2007 +0100
-
- b43: Fix upload of beacon packets to the hardware
-
- This fixes uploading of the beacon data and writing of the
- TIM and DTIM offsets.
-
- Signed-off-by: Michael Buesch <mb at bu3sch.de>
- Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
commit f837f24a5083189e192d695895221b79344155a4
Author: Michael Buesch <mb at bu3sch.de>
Date: Wed Dec 26 16:26:36 2007 +0100
@@ -5872,7 +5813,7 @@
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 2008-01-08 20:02:59.000000000 -0500
-+++ linux-2.6.23.noarch/include/linux/nl80211.h 2008-01-08 20:31:10.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/nl80211.h 2008-01-09 10:53:36.000000000 -0500
@@ -7,6 +7,18 @@
*/
@@ -6075,7 +6016,7 @@
#endif /* __LINUX_NL80211_H */
diff -up linux-2.6.23.noarch/include/linux/wireless.h.orig linux-2.6.23.noarch/include/linux/wireless.h
--- linux-2.6.23.noarch/include/linux/wireless.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/include/linux/wireless.h 2008-01-08 20:31:10.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/wireless.h 2008-01-09 10:53:36.000000000 -0500
@@ -541,6 +541,16 @@
/* Maximum size of returned data */
#define IW_SCAN_MAX_DATA 4096 /* In bytes */
@@ -6105,7 +6046,7 @@
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 2008-01-08 20:02:59.000000000 -0500
-+++ linux-2.6.23.noarch/include/linux/ieee80211.h 2008-01-08 20:31:53.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/ieee80211.h 2008-01-09 10:53:37.000000000 -0500
@@ -54,6 +54,8 @@
#define IEEE80211_STYPE_ACTION 0x00D0
@@ -6331,7 +6272,7 @@
#define WLAN_CIPHER_SUITE_WEP40 0x000FAC01
diff -up linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h.orig linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h
--- linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h.orig 2008-01-08 20:02:59.000000000 -0500
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h 2008-01-08 20:32:38.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb_regs.h 2008-01-09 10:53:37.000000000 -0500
@@ -147,6 +147,10 @@
#define SSB_IDLOW_SSBREV 0xF0000000 /* Sonics Backplane Revision code */
#define SSB_IDLOW_SSBREV_22 0x00000000 /* <= 2.2 */
@@ -6464,7 +6405,7 @@
SSB_SPROM1CCODE_WORLD = 0,
diff -up linux-2.6.23.noarch/include/linux/ssb/ssb.h.orig linux-2.6.23.noarch/include/linux/ssb/ssb.h
--- linux-2.6.23.noarch/include/linux/ssb/ssb.h.orig 2008-01-08 20:02:59.000000000 -0500
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb.h 2008-01-08 20:32:38.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb.h 2008-01-09 10:53:37.000000000 -0500
@@ -15,22 +15,19 @@ struct pcmcia_device;
struct ssb_bus;
struct ssb_driver;
@@ -6608,7 +6549,7 @@
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 2008-01-08 20:02:59.000000000 -0500
-+++ linux-2.6.23.noarch/include/net/cfg80211.h 2008-01-08 20:31:10.000000000 -0500
++++ linux-2.6.23.noarch/include/net/cfg80211.h 2008-01-09 10:53:37.000000000 -0500
@@ -49,6 +49,120 @@ extern int ieee80211_radiotap_iterator_n
struct ieee80211_radiotap_iterator *iterator);
@@ -6799,7 +6740,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 2008-01-08 20:02:59.000000000 -0500
-+++ linux-2.6.23.noarch/include/net/ieee80211.h 2008-01-08 20:32:38.000000000 -0500
++++ linux-2.6.23.noarch/include/net/ieee80211.h 2008-01-09 10:53:37.000000000 -0500
@@ -677,7 +677,7 @@ struct ieee80211_probe_request {
struct ieee80211_probe_response {
@@ -6822,7 +6763,7 @@
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 2008-01-08 20:02:59.000000000 -0500
-+++ linux-2.6.23.noarch/include/net/mac80211.h 2008-01-08 20:31:53.000000000 -0500
++++ linux-2.6.23.noarch/include/net/mac80211.h 2008-01-09 10:53:37.000000000 -0500
@@ -139,17 +139,54 @@ enum ieee80211_phymode {
};
@@ -7103,7 +7044,7 @@
#endif /* MAC80211_H */
diff -up linux-2.6.23.noarch/MAINTAINERS.orig linux-2.6.23.noarch/MAINTAINERS
--- linux-2.6.23.noarch/MAINTAINERS.orig 2008-01-08 20:02:49.000000000 -0500
-+++ linux-2.6.23.noarch/MAINTAINERS 2008-01-08 20:31:53.000000000 -0500
++++ linux-2.6.23.noarch/MAINTAINERS 2008-01-09 10:53:37.000000000 -0500
@@ -805,7 +805,7 @@ P: Stefano Brivio
M: stefano.brivio at polimi.it
L: linux-wireless at vger.kernel.org
@@ -7169,7 +7110,7 @@
M: kaber at trash.net
diff -up linux-2.6.23.noarch/net/ieee80211/ieee80211_rx.c.orig linux-2.6.23.noarch/net/ieee80211/ieee80211_rx.c
--- linux-2.6.23.noarch/net/ieee80211/ieee80211_rx.c.orig 2008-01-08 20:02:59.000000000 -0500
-+++ linux-2.6.23.noarch/net/ieee80211/ieee80211_rx.c 2008-01-08 20:32:38.000000000 -0500
++++ linux-2.6.23.noarch/net/ieee80211/ieee80211_rx.c 2008-01-09 10:53:37.000000000 -0500
@@ -754,7 +754,7 @@ int ieee80211_rx(struct ieee80211_device
memcpy(skb_push(skb, ETH_ALEN), src, ETH_ALEN);
memcpy(skb_push(skb, ETH_ALEN), dst, ETH_ALEN);
@@ -7247,7 +7188,7 @@
IEEE80211_DEBUG_SCAN("Dropped '%s' (%s) via %s.\n",
diff -up linux-2.6.23.noarch/net/ieee80211/ieee80211_crypt_tkip.c.orig linux-2.6.23.noarch/net/ieee80211/ieee80211_crypt_tkip.c
--- linux-2.6.23.noarch/net/ieee80211/ieee80211_crypt_tkip.c.orig 2008-01-08 20:02:59.000000000 -0500
-+++ linux-2.6.23.noarch/net/ieee80211/ieee80211_crypt_tkip.c 2008-01-08 20:32:38.000000000 -0500
++++ linux-2.6.23.noarch/net/ieee80211/ieee80211_crypt_tkip.c 2008-01-09 10:53:37.000000000 -0500
@@ -189,7 +189,7 @@ static inline u16 Mk16(u8 hi, u8 lo)
return lo | (((u16) hi) << 8);
}
@@ -7292,7 +7233,7 @@
{
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 2008-01-08 20:02:59.000000000 -0500
-+++ linux-2.6.23.noarch/net/ieee80211/ieee80211_wx.c 2008-01-08 20:31:10.000000000 -0500
++++ linux-2.6.23.noarch/net/ieee80211/ieee80211_wx.c 2008-01-09 10:53:37.000000000 -0500
@@ -709,7 +709,7 @@ int ieee80211_wx_get_encodeext(struct ie
} else
idx = ieee->tx_keyidx;
@@ -7304,7 +7245,7 @@
return -EINVAL;
diff -up linux-2.6.23.noarch/net/ieee80211/ieee80211_tx.c.orig linux-2.6.23.noarch/net/ieee80211/ieee80211_tx.c
--- linux-2.6.23.noarch/net/ieee80211/ieee80211_tx.c.orig 2008-01-08 20:02:59.000000000 -0500
-+++ linux-2.6.23.noarch/net/ieee80211/ieee80211_tx.c 2008-01-08 20:32:38.000000000 -0500
++++ linux-2.6.23.noarch/net/ieee80211/ieee80211_tx.c 2008-01-09 10:53:37.000000000 -0500
@@ -126,7 +126,7 @@ payload of each frame is reduced to 492
static u8 P802_1H_OUI[P80211_OUI_LEN] = { 0x00, 0x00, 0xf8 };
static u8 RFC1042_OUI[P80211_OUI_LEN] = { 0x00, 0x00, 0x00 };
@@ -7366,7 +7307,7 @@
}
[...2887 lines suppressed...]
Supported chipsets: RT2560.
*/
@@ -85712,7 +84986,7 @@
.remove = __devexit_p(rt2x00pci_remove),
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 2008-01-08 20:02:56.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.c 2008-01-08 20:32:38.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.c 2008-01-09 10:53:38.000000000 -0500
@@ -24,11 +24,6 @@
Supported chipsets: RT2561, RT2561s, RT2661.
*/
@@ -86631,7 +85905,7 @@
.remove = __devexit_p(rt2x00pci_remove),
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 2008-01-08 20:02:56.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c 2008-01-08 20:32:38.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.c 2008-01-09 10:53:38.000000000 -0500
@@ -23,11 +23,6 @@
Abstract: rt2x00 generic pci device routines.
*/
@@ -86843,7 +86117,7 @@
*/
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 2008-01-08 20:02:56.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h 2008-01-08 20:31:10.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00pci.h 2008-01-09 10:53:38.000000000 -0500
@@ -57,7 +57,7 @@
/*
* Register access.
@@ -86894,7 +86168,7 @@
* Device initialization handlers.
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 2008-01-08 20:02:56.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.c 2008-01-08 20:32:38.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.c 2008-01-09 10:53:38.000000000 -0500
@@ -24,11 +24,6 @@
Supported chipsets: rt2571W & rt2671.
*/
@@ -87553,7 +86827,7 @@
.disconnect = rt2x00usb_disconnect,
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 2008-01-08 20:02:56.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/p54pci.c 2008-01-08 20:32:38.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/p54pci.c 2008-01-09 10:53:38.000000000 -0500
@@ -48,10 +48,10 @@ static int p54p_upload_firmware(struct i
const struct firmware *fw_entry = NULL;
__le32 reg;
@@ -87829,7 +87103,7 @@
static int __devinit p54p_probe(struct pci_dev *pdev,
diff -up linux-2.6.23.noarch/drivers/net/wireless/adm8211.c.orig linux-2.6.23.noarch/drivers/net/wireless/adm8211.c
--- linux-2.6.23.noarch/drivers/net/wireless/adm8211.c.orig 2008-01-08 20:02:56.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/adm8211.c 2008-01-08 20:32:38.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/adm8211.c 2008-01-09 10:53:38.000000000 -0500
@@ -104,7 +104,7 @@ static int adm8211_read_eeprom(struct ie
if (!priv->eeprom)
return -ENOMEM;
@@ -87854,7 +87128,7 @@
printk(KERN_WARNING "%s (adm8211): Invalid hwaddr in EEPROM!\n",
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_common.h.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_common.h
--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_common.h.orig 2008-01-08 20:02:56.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_common.h 2008-01-08 20:32:38.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_common.h 2008-01-09 10:53:38.000000000 -0500
@@ -188,10 +188,10 @@
struct hfa384x_comp_ident
@@ -87919,7 +87193,7 @@
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_80211_rx.c.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_80211_rx.c
--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_80211_rx.c.orig 2008-01-08 20:02:56.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_80211_rx.c 2008-01-08 20:32:38.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_80211_rx.c 2008-01-09 10:53:38.000000000 -0500
@@ -1039,7 +1039,7 @@ void hostap_80211_rx(struct net_device *
memcpy(skb_push(skb, ETH_ALEN), src, ETH_ALEN);
memcpy(skb_push(skb, ETH_ALEN), dst, ETH_ALEN);
@@ -87931,7 +87205,7 @@
len = htons(skb->len);
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ap.c.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ap.c
--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ap.c.orig 2008-01-08 20:02:56.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ap.c 2008-01-08 20:32:38.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ap.c 2008-01-09 10:53:38.000000000 -0500
@@ -258,7 +258,7 @@ static void ap_handle_timer(unsigned lon
sta->addr, ap->tx_callback_poll);
} else {
@@ -88192,7 +87466,7 @@
if (local->ap->ap_policy != AP_OTHER_AP_EVEN_IBSS &&
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_wlan.h.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_wlan.h
--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_wlan.h.orig 2008-01-08 20:02:56.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_wlan.h 2008-01-08 20:32:38.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_wlan.h 2008-01-09 10:53:38.000000000 -0500
@@ -39,20 +39,20 @@ struct linux_wlan_ng_prism_hdr {
} __attribute__ ((packed));
@@ -88494,7 +87768,7 @@
struct comm_tallies_sums {
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_pci.c.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_pci.c
--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_pci.c.orig 2008-01-08 20:02:56.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_pci.c 2008-01-08 20:32:38.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_pci.c 2008-01-09 10:53:38.000000000 -0500
@@ -128,8 +128,8 @@ static inline u16 hfa384x_inw_debug(stru
#define HFA384X_INB(a) hfa384x_inb_debug(dev, (a))
#define HFA384X_OUTW(v,a) hfa384x_outw_debug(dev, (a), (v))
@@ -88545,7 +87819,7 @@
HFA384X_OUTW_DATA(*pos++, d_off);
diff -up linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_download.c.orig linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_download.c
--- linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_download.c.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_download.c 2008-01-08 20:32:38.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_download.c 2008-01-09 10:53:38.000000000 -0500
@@ -100,7 +100,7 @@ static int hfa384x_from_aux(struct net_d
#ifdef PRISM2_PCI
@@ -88607,7 +87881,7 @@
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 2008-01-08 20:02:56.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_hw.c 2008-01-08 20:32:38.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_hw.c 2008-01-09 10:53:38.000000000 -0500
@@ -1075,7 +1075,7 @@ static int prism2_setup_rids(struct net_
{
struct hostap_interface *iface;
@@ -88695,7 +87969,7 @@
}
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 2008-01-08 20:02:56.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_main.c 2008-01-08 20:32:38.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_main.c 2008-01-09 10:53:38.000000000 -0500
@@ -296,7 +296,7 @@ int hostap_tx_callback_unregister(local_
int hostap_set_word(struct net_device *dev, int rid, u16 val)
{
@@ -88725,7 +87999,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 2008-01-08 20:02:56.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_info.c 2008-01-08 20:32:38.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_info.c 2008-01-09 10:53:38.000000000 -0500
@@ -303,7 +303,7 @@ static void prism2_info_hostscanresults(
int i, result_size, copy_len, new_count;
struct hfa384x_hostscan_result *results, *prev;
@@ -88765,7 +88039,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-08 20:32:38.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_80211.h 2008-01-09 10:53:38.000000000 -0500
@@ -5,52 +5,52 @@
#include <net/ieee80211_crypt.h>
@@ -88838,7 +88112,7 @@
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-08 20:02:56.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c 2008-01-08 20:32:38.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/hostap/hostap_ioctl.c 2008-01-09 10:53:38.000000000 -0500
@@ -84,7 +84,7 @@ static int prism2_get_datarates(struct n
if (len < 2)
return 0;
@@ -89104,7 +88378,7 @@
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-08 20:02:57.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c 2008-01-08 20:32:38.000000000 -0500
++++ linux-2.6.23.noarch/drivers/ssb/b43_pci_bridge.c 2008-01-09 10:53:38.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) },
@@ -89116,7 +88390,7 @@
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-08 20:02:57.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/pcmcia.c 2008-01-08 20:32:38.000000000 -0500
++++ linux-2.6.23.noarch/drivers/ssb/pcmcia.c 2008-01-09 10:53:38.000000000 -0500
@@ -94,7 +94,6 @@ int ssb_pcmcia_switch_core(struct ssb_bu
struct ssb_device *dev)
{
@@ -89268,7 +88542,7 @@
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-08 20:02:57.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/main.c 2008-01-08 20:31:10.000000000 -0500
++++ linux-2.6.23.noarch/drivers/ssb/main.c 2008-01-09 10:53:38.000000000 -0500
@@ -872,14 +872,22 @@ EXPORT_SYMBOL(ssb_clockspeed);
static u32 ssb_tmslow_reject_bitmask(struct ssb_device *dev)
@@ -89295,7 +88569,7 @@
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-08 20:02:57.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/pci.c 2008-01-08 20:32:38.000000000 -0500
++++ linux-2.6.23.noarch/drivers/ssb/pci.c 2008-01-09 10:53:38.000000000 -0500
@@ -212,29 +212,29 @@ static inline u8 ssb_crc8(u8 crc, u8 dat
return t[crc ^ data];
}
@@ -89739,7 +89013,7 @@
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-08 20:02:48.000000000 -0500
-+++ linux-2.6.23.noarch/Documentation/feature-removal-schedule.txt 2008-01-08 20:31:10.000000000 -0500
++++ linux-2.6.23.noarch/Documentation/feature-removal-schedule.txt 2008-01-09 10:53:38.000000000 -0500
@@ -333,3 +333,28 @@ Why: This driver has been marked obsolet
Who: Stephen Hemminger <shemminger at linux-foundation.org>
More information about the fedora-extras-commits
mailing list