rpms/kernel/F-7 linux-2.6-wireless-pending-too.patch,1.2,1.3
John W. Linville (linville)
fedora-extras-commits at redhat.com
Thu Jan 17 21:53:56 UTC 2008
Author: linville
Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16718
Modified Files:
linux-2.6-wireless-pending-too.patch
Log Message:
add missing includes to fix ppc build breakage
linux-2.6-wireless-pending-too.patch:
Index: linux-2.6-wireless-pending-too.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-wireless-pending-too.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-wireless-pending-too.patch 17 Jan 2008 21:36:37 -0000 1.2
+++ linux-2.6-wireless-pending-too.patch 17 Jan 2008 21:53:50 -0000 1.3
@@ -686,8 +686,8 @@
Signed-off-by: John W. Linville <linville at tuxdriver.com>
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-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/include/linux/ssb/ssb.h 2008-01-17 15:23:54.000000000 -0500
+--- linux-2.6.23.noarch/include/linux/ssb/ssb.h.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/include/linux/ssb/ssb.h 2008-01-17 16:46:55.000000000 -0500
@@ -43,6 +43,7 @@ struct ssb_sprom {
u8 itssi_a; /* Idle TSSI Target for A-PHY */
u8 itssi_bg; /* Idle TSSI Target for B/G-PHY */
@@ -697,8 +697,8 @@
/* Antenna gain values for up to 4 antennas
* on each band. Values in dBm/4 (Q5.2). Negative gain means the
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-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/include/net/mac80211.h 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/include/net/mac80211.h.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/include/net/mac80211.h 2008-01-17 16:46:55.000000000 -0500
@@ -275,11 +275,49 @@ struct ieee80211_low_level_stats {
unsigned int dot11RTSSuccessCount;
};
@@ -1022,8 +1022,8 @@
#endif /* MAC80211_H */
diff -up linux-2.6.23.noarch/net/mac80211/rx.c.orig linux-2.6.23.noarch/net/mac80211/rx.c
---- linux-2.6.23.noarch/net/mac80211/rx.c.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/net/mac80211/rx.c 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/net/mac80211/rx.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/net/mac80211/rx.c 2008-01-17 16:46:55.000000000 -0500
@@ -223,7 +223,7 @@ ieee80211_rx_monitor(struct ieee80211_lo
if (!netif_running(sdata->dev))
continue;
@@ -1162,8 +1162,8 @@
prepares = prepare_for_handlers(sdata, bssid, &rx, hdr);
/* prepare_for_handlers can change sta */
diff -up linux-2.6.23.noarch/net/mac80211/ieee80211_iface.c.orig linux-2.6.23.noarch/net/mac80211/ieee80211_iface.c
---- linux-2.6.23.noarch/net/mac80211/ieee80211_iface.c.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/net/mac80211/ieee80211_iface.c 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/net/mac80211/ieee80211_iface.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/net/mac80211/ieee80211_iface.c 2008-01-17 16:46:55.000000000 -0500
@@ -47,7 +47,7 @@ int ieee80211_if_add(struct net_device *
int ret;
@@ -1237,8 +1237,8 @@
sdata->dev != local->mdev) {
list_del_rcu(&sdata->list);
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 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/net/mac80211/ieee80211_ioctl.c 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/net/mac80211/ieee80211_ioctl.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/net/mac80211/ieee80211_ioctl.c 2008-01-17 16:46:55.000000000 -0500
@@ -111,8 +111,8 @@ static int ieee80211_ioctl_siwgenie(stru
if (sdata->flags & IEEE80211_SDATA_USERSPACE_MLME)
return -EOPNOTSUPP;
@@ -1447,8 +1447,8 @@
else
ret = -EOPNOTSUPP;
diff -up linux-2.6.23.noarch/net/mac80211/ieee80211_rate.c.orig linux-2.6.23.noarch/net/mac80211/ieee80211_rate.c
---- linux-2.6.23.noarch/net/mac80211/ieee80211_rate.c.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/net/mac80211/ieee80211_rate.c 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/net/mac80211/ieee80211_rate.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/net/mac80211/ieee80211_rate.c 2008-01-17 16:46:55.000000000 -0500
@@ -168,29 +168,13 @@ void rate_control_get_rate(struct net_de
{
struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
@@ -1481,8 +1481,8 @@
/* Select a non-ERP backup rate. */
if (!sel->nonerp) {
diff -up linux-2.6.23.noarch/net/mac80211/rc80211_pid_algo.c.orig linux-2.6.23.noarch/net/mac80211/rc80211_pid_algo.c
---- linux-2.6.23.noarch/net/mac80211/rc80211_pid_algo.c.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/net/mac80211/rc80211_pid_algo.c 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/net/mac80211/rc80211_pid_algo.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/net/mac80211/rc80211_pid_algo.c 2008-01-17 16:46:55.000000000 -0500
@@ -310,22 +310,36 @@ static void rate_control_pid_get_rate(vo
{
struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
@@ -1524,8 +1524,8 @@
sel->rate = &mode->rates[rateidx];
diff -up linux-2.6.23.noarch/net/mac80211/key.c.orig linux-2.6.23.noarch/net/mac80211/key.c
---- linux-2.6.23.noarch/net/mac80211/key.c.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/net/mac80211/key.c 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/net/mac80211/key.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/net/mac80211/key.c 2008-01-17 16:46:55.000000000 -0500
@@ -49,8 +49,8 @@ static const u8 *get_mac_for_key(struct
* address to indicate a transmit-only key.
*/
@@ -1547,8 +1547,8 @@
/* same here, the AP could be using QoS */
diff -up linux-2.6.23.noarch/net/mac80211/ieee80211.c.orig linux-2.6.23.noarch/net/mac80211/ieee80211.c
---- linux-2.6.23.noarch/net/mac80211/ieee80211.c.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/net/mac80211/ieee80211.c 2008-01-17 15:23:54.000000000 -0500
+--- linux-2.6.23.noarch/net/mac80211/ieee80211.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/net/mac80211/ieee80211.c 2008-01-17 16:46:55.000000000 -0500
@@ -176,21 +176,21 @@ static int ieee80211_open(struct net_dev
/*
* check whether it may have the same address
@@ -1781,8 +1781,8 @@
sdata->local = local;
sdata->u.ap.force_unicast_rateidx = -1;
diff -up linux-2.6.23.noarch/net/mac80211/rc80211_simple.c.orig linux-2.6.23.noarch/net/mac80211/rc80211_simple.c
---- linux-2.6.23.noarch/net/mac80211/rc80211_simple.c.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/net/mac80211/rc80211_simple.c 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/net/mac80211/rc80211_simple.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/net/mac80211/rc80211_simple.c 2008-01-17 16:46:55.000000000 -0500
@@ -206,21 +206,36 @@ rate_control_simple_get_rate(void *priv,
{
struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
@@ -1823,8 +1823,8 @@
sel->rate = &mode->rates[rateidx];
diff -up linux-2.6.23.noarch/net/mac80211/ieee80211_i.h.orig linux-2.6.23.noarch/net/mac80211/ieee80211_i.h
---- linux-2.6.23.noarch/net/mac80211/ieee80211_i.h.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/net/mac80211/ieee80211_i.h 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/net/mac80211/ieee80211_i.h.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/net/mac80211/ieee80211_i.h 2008-01-17 16:46:55.000000000 -0500
@@ -192,9 +192,14 @@ typedef ieee80211_txrx_result (*ieee8021
typedef ieee80211_txrx_result (*ieee80211_rx_handler)
(struct ieee80211_txrx_data *rx);
@@ -1927,8 +1927,8 @@
int ieee80211_ht_cap_ie_to_ht_info(struct ieee80211_ht_cap *ht_cap_ie,
struct ieee80211_ht_info *ht_info);
diff -up linux-2.6.23.noarch/net/mac80211/cfg.c.orig linux-2.6.23.noarch/net/mac80211/cfg.c
---- linux-2.6.23.noarch/net/mac80211/cfg.c.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/net/mac80211/cfg.c 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/net/mac80211/cfg.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/net/mac80211/cfg.c 2008-01-17 16:46:55.000000000 -0500
@@ -9,9 +9,11 @@
#include <linux/ieee80211.h>
#include <linux/nl80211.h>
@@ -2310,8 +2310,8 @@
.get_station = ieee80211_get_station,
};
diff -up linux-2.6.23.noarch/net/mac80211/ieee80211_sta.c.orig linux-2.6.23.noarch/net/mac80211/ieee80211_sta.c
---- linux-2.6.23.noarch/net/mac80211/ieee80211_sta.c.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/net/mac80211/ieee80211_sta.c 2008-01-17 15:23:54.000000000 -0500
+--- linux-2.6.23.noarch/net/mac80211/ieee80211_sta.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/net/mac80211/ieee80211_sta.c 2008-01-17 16:46:55.000000000 -0500
@@ -313,47 +313,41 @@ static void ieee80211_sta_wmm_params(str
}
@@ -2696,8 +2696,8 @@
if (!(ifsta->flags & IEEE80211_STA_ASSOCIATED))
diff -up linux-2.6.23.noarch/net/mac80211/tx.c.orig linux-2.6.23.noarch/net/mac80211/tx.c
---- linux-2.6.23.noarch/net/mac80211/tx.c.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/net/mac80211/tx.c 2008-01-17 15:23:54.000000000 -0500
+--- linux-2.6.23.noarch/net/mac80211/tx.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/net/mac80211/tx.c 2008-01-17 16:46:55.000000000 -0500
@@ -174,7 +174,7 @@ static u16 ieee80211_duration(struct iee
* to closest integer */
@@ -3037,8 +3037,8 @@
if (res == TXRX_DROP) {
diff -up linux-2.6.23.noarch/net/mac80211/sta_info.c.orig linux-2.6.23.noarch/net/mac80211/sta_info.c
---- linux-2.6.23.noarch/net/mac80211/sta_info.c.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/net/mac80211/sta_info.c 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/net/mac80211/sta_info.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/net/mac80211/sta_info.c 2008-01-17 16:46:55.000000000 -0500
@@ -176,9 +176,16 @@ struct sta_info * sta_info_add(struct ie
list_add(&sta->list, &local->sta_list);
local->num_sta++;
@@ -3081,8 +3081,8 @@
rate_control_remove_sta_debugfs(sta);
ieee80211_sta_debugfs_remove(sta);
diff -up linux-2.6.23.noarch/net/mac80211/util.c.orig linux-2.6.23.noarch/net/mac80211/util.c
---- linux-2.6.23.noarch/net/mac80211/util.c.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/net/mac80211/util.c 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/net/mac80211/util.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/net/mac80211/util.c 2008-01-17 16:46:55.000000000 -0500
@@ -301,45 +301,35 @@ int ieee80211_frame_duration(struct ieee
}
@@ -3216,8 +3216,8 @@
rcu_read_unlock();
diff -up linux-2.6.23.noarch/net/mac80211/debugfs_netdev.c.orig linux-2.6.23.noarch/net/mac80211/debugfs_netdev.c
---- linux-2.6.23.noarch/net/mac80211/debugfs_netdev.c.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/net/mac80211/debugfs_netdev.c 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/net/mac80211/debugfs_netdev.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/net/mac80211/debugfs_netdev.c 2008-01-17 16:46:55.000000000 -0500
@@ -117,13 +117,12 @@ static ssize_t ieee80211_if_fmt_flags(
sdata->u.sta.flags & IEEE80211_STA_AUTHENTICATED ? "AUTH\n" : "",
sdata->u.sta.flags & IEEE80211_STA_ASSOCIATED ? "ASSOC\n" : "",
@@ -3309,8 +3309,8 @@
sdata->debugfsdir = NULL;
}
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 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/p54common.c 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/p54common.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/p54common.c 2008-01-17 16:46:55.000000000 -0500
@@ -854,7 +854,8 @@ static int p54_config(struct ieee80211_h
return ret;
}
@@ -3322,8 +3322,8 @@
{
struct p54_common *priv = dev->priv;
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43/phy.c.orig linux-2.6.23.noarch/drivers/net/wireless/b43/phy.c
---- linux-2.6.23.noarch/drivers/net/wireless/b43/phy.c.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/phy.c 2008-01-17 15:23:51.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/phy.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/phy.c 2008-01-17 16:46:55.000000000 -0500
@@ -307,6 +307,24 @@ void b43_phy_write(struct b43_wldev *dev
b43_write16(dev, B43_MMIO_PHY_DATA, val);
}
@@ -3527,8 +3527,8 @@
phy->radio_on = 0;
}
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43/Makefile.orig linux-2.6.23.noarch/drivers/net/wireless/b43/Makefile
---- linux-2.6.23.noarch/drivers/net/wireless/b43/Makefile.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/Makefile 2008-01-17 15:23:51.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/Makefile.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/Makefile 2008-01-17 16:46:55.000000000 -0500
@@ -1,5 +1,6 @@
b43-y += main.o
b43-y += tables.o
@@ -3538,7 +3538,7 @@
b43-y += sysfs.o
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/b43/tables_nphy.c
--- /dev/null 2008-01-17 10:02:41.585276202 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/tables_nphy.c 2008-01-17 15:23:51.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/tables_nphy.c 2008-01-17 16:46:55.000000000 -0500
@@ -0,0 +1,2476 @@
+/*
+
@@ -6017,8 +6017,8 @@
+ assert_ntab_array_sizes();
+}
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 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/main.c 2008-01-17 15:23:51.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/main.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/main.c 2008-01-17 16:46:55.000000000 -0500
@@ -252,13 +252,12 @@ static void b43_ram_write(struct b43_wld
b43_write32(dev, B43_MMIO_RAM_DATA, val);
}
@@ -6728,7 +6728,7 @@
diff -up /dev/null linux-2.6.23.noarch/drivers/net/wireless/b43/tables_nphy.h
--- /dev/null 2008-01-17 10:02:41.585276202 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/tables_nphy.h 2008-01-17 15:23:51.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/tables_nphy.h 2008-01-17 16:46:55.000000000 -0500
@@ -0,0 +1,159 @@
+#ifndef B43_TABLES_NPHY_H_
+#define B43_TABLES_NPHY_H_
@@ -6890,8 +6890,8 @@
+
+#endif /* B43_TABLES_NPHY_H_ */
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 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/xmit.c 2008-01-17 15:23:51.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/xmit.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/xmit.c 2008-01-17 16:46:55.000000000 -0500
@@ -177,13 +177,15 @@ static u8 b43_calc_fallback_rate(u8 bitr
return 0;
}
@@ -7139,8 +7139,8 @@
static s8 b43_rssi_postprocess(struct b43_wldev *dev,
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43/phy.h.orig linux-2.6.23.noarch/drivers/net/wireless/b43/phy.h
---- linux-2.6.23.noarch/drivers/net/wireless/b43/phy.h.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/phy.h 2008-01-17 15:23:51.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/phy.h.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/phy.h 2008-01-17 16:46:55.000000000 -0500
@@ -180,6 +180,8 @@ enum {
B43_ANTENNA1, /* Antenna 0 */
B43_ANTENNA_AUTO1, /* Automatic, starting with antenna 1 */
@@ -7189,8 +7189,8 @@
u16 b43_radio_init2050(struct b43_wldev *dev);
void b43_radio_init2060(struct b43_wldev *dev);
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43/xmit.h.orig linux-2.6.23.noarch/drivers/net/wireless/b43/xmit.h
---- linux-2.6.23.noarch/drivers/net/wireless/b43/xmit.h.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/xmit.h 2008-01-17 15:23:51.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/xmit.h.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/xmit.h 2008-01-17 16:46:55.000000000 -0500
@@ -19,68 +19,160 @@ _b43_declare_plcp_hdr(6);
#undef _b43_declare_plcp_hdr
@@ -7407,8 +7407,8 @@
void b43_generate_txhdr(struct b43_wldev *dev,
u8 * txhdr,
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43/dma.c.orig linux-2.6.23.noarch/drivers/net/wireless/b43/dma.c
---- linux-2.6.23.noarch/drivers/net/wireless/b43/dma.c.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/dma.c 2008-01-17 15:23:51.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/dma.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/dma.c 2008-01-17 16:46:55.000000000 -0500
@@ -37,6 +37,8 @@
#include <linux/pci.h>
#include <linux/delay.h>
@@ -7668,8 +7668,8 @@
if (meta->is_last_fragment) {
B43_WARN_ON(!meta->skb);
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43/b43.h.orig linux-2.6.23.noarch/drivers/net/wireless/b43/b43.h
---- linux-2.6.23.noarch/drivers/net/wireless/b43/b43.h.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/b43.h 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/b43.h.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/b43.h 2008-01-17 16:46:55.000000000 -0500
@@ -170,14 +170,17 @@ enum {
#define B43_SHM_SH_SLOTT 0x0010 /* Slot time */
#define B43_SHM_SH_DTIMPER 0x0012 /* DTIM period */
@@ -7737,8 +7737,8 @@
struct b43_firmware fw;
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43/nphy.h.orig linux-2.6.23.noarch/drivers/net/wireless/b43/nphy.h
---- linux-2.6.23.noarch/drivers/net/wireless/b43/nphy.h.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/nphy.h 2008-01-17 15:23:51.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/nphy.h.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/nphy.h 2008-01-17 16:46:55.000000000 -0500
@@ -12,6 +12,7 @@
#define B43_NPHY_CHANNEL B43_PHY_N(0x005) /* Channel */
#define B43_NPHY_TXERR B43_PHY_N(0x007) /* TX error */
@@ -7983,15 +7983,20 @@
+
#endif /* B43_NPHY_H_ */
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43/nphy.c.orig linux-2.6.23.noarch/drivers/net/wireless/b43/nphy.c
---- linux-2.6.23.noarch/drivers/net/wireless/b43/nphy.c.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43/nphy.c 2008-01-17 15:23:51.000000000 -0500
-@@ -24,11 +24,173 @@
+--- linux-2.6.23.noarch/drivers/net/wireless/b43/nphy.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43/nphy.c 2008-01-17 16:48:06.000000000 -0500
+@@ -22,13 +22,178 @@
+ */
+
++#include <linux/delay.h>
++#include <linux/types.h>
++
#include "b43.h"
#include "nphy.h"
+#include "tables_nphy.h"
-
-
++
++
+void b43_nphy_set_rxantenna(struct b43_wldev *dev, int antenna)
+{//TODO
+}
@@ -8052,7 +8057,7 @@
+ tabent = b43_nphy_get_chantabent(dev, channel);
+ if (!tabent)
+ return -ESRCH;
-+
+
+ //FIXME enable/disable band select upper20 in RXCTL
+ if (0 /*FIXME 5Ghz*/)
+ b43_radio_maskset(dev, B2055_MASTER1, 0xFF8F, 0x20);
@@ -8152,7 +8157,7 @@
+ b43_phy_mask(dev, B43_NPHY_RFCTL_CMD,
+ ~B43_NPHY_RFCTL_CMD_EN);
+}
-+
+
int b43_phy_initn(struct b43_wldev *dev)
{
b43err(dev->wl, "IEEE 802.11n devices are not supported, yet.\n");
@@ -8161,8 +8166,8 @@
+ return 0;
}
diff -up linux-2.6.23.noarch/drivers/net/wireless/zd1211rw/zd_mac.c.orig linux-2.6.23.noarch/drivers/net/wireless/zd1211rw/zd_mac.c
---- linux-2.6.23.noarch/drivers/net/wireless/zd1211rw/zd_mac.c.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/zd1211rw/zd_mac.c 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/zd1211rw/zd_mac.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/zd1211rw/zd_mac.c 2008-01-17 16:46:55.000000000 -0500
@@ -733,7 +733,8 @@ static int zd_op_config(struct ieee80211
return zd_chip_set_channel(&mac->chip, conf->channel);
}
@@ -8207,8 +8212,8 @@
struct ieee80211_hw *zd_mac_alloc_hw(struct usb_interface *intf)
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 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/main.c 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/main.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/main.c 2008-01-17 16:46:55.000000000 -0500
@@ -976,7 +976,7 @@ static void b43legacy_write_probe_resp_p
plcp.data = 0;
b43legacy_generate_plcp_hdr(&plcp, size + FCS_LEN, rate);
@@ -8265,8 +8270,8 @@
wl->operating = 0;
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43legacy/xmit.c.orig linux-2.6.23.noarch/drivers/net/wireless/b43legacy/xmit.c
---- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/xmit.c.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/xmit.c 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/xmit.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/xmit.c 2008-01-17 16:46:55.000000000 -0500
@@ -223,7 +223,7 @@ static void generate_txhdr_fw3(struct b4
} else {
int fbrate_base100kbps = B43legacy_RATE_TO_100KBPS(rate_fb);
@@ -8295,8 +8300,8 @@
(struct ieee80211_rts *)
(txhdr->rts_frame));
diff -up linux-2.6.23.noarch/drivers/net/wireless/b43legacy/rfkill.c.orig linux-2.6.23.noarch/drivers/net/wireless/b43legacy/rfkill.c
---- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/rfkill.c.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/rfkill.c 2008-01-17 15:23:51.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/rfkill.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/rfkill.c 2008-01-17 16:46:55.000000000 -0500
@@ -141,8 +141,11 @@ void b43legacy_rfkill_init(struct b43leg
rfk->rfkill->user_claim_unsupported = 1;
@@ -8330,8 +8335,8 @@
}
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 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/b43legacy.h 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/b43legacy/b43legacy.h 2008-01-17 16:46:55.000000000 -0500
@@ -577,10 +577,7 @@ struct b43legacy_wl {
* at a time. General information about this interface follows.
*/
@@ -8345,8 +8350,8 @@
u8 mac_addr[ETH_ALEN];
/* Current BSSID (can be NULL). */
diff -up linux-2.6.23.noarch/drivers/net/wireless/wavelan_cs.p.h.orig linux-2.6.23.noarch/drivers/net/wireless/wavelan_cs.p.h
---- linux-2.6.23.noarch/drivers/net/wireless/wavelan_cs.p.h.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/wavelan_cs.p.h 2008-01-17 15:23:54.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/wavelan_cs.p.h.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/wavelan_cs.p.h 2008-01-17 16:46:55.000000000 -0500
@@ -459,7 +459,6 @@
#undef WAVELAN_ROAMING_EXT /* Enable roaming wireless extensions */
#undef SET_PSA_CRC /* Set the CRC in PSA (slower) */
@@ -8356,8 +8361,8 @@
#define MULTICAST_AVOID /* Avoid extra multicast (I'm sceptical) */
#undef SET_MAC_ADDRESS /* Experimental */
diff -up linux-2.6.23.noarch/drivers/net/wireless/wavelan.c.orig linux-2.6.23.noarch/drivers/net/wireless/wavelan.c
---- linux-2.6.23.noarch/drivers/net/wireless/wavelan.c.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/wavelan.c 2008-01-17 15:23:54.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/wavelan.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/wavelan.c 2008-01-17 16:46:55.000000000 -0500
@@ -49,27 +49,6 @@ static int __init wv_psa_to_irq(u8 irqva
return -1;
}
@@ -8407,8 +8412,8 @@
dev = alloc_etherdev(sizeof(net_local));
if (!dev)
diff -up linux-2.6.23.noarch/drivers/net/wireless/rtl8187_dev.c.orig linux-2.6.23.noarch/drivers/net/wireless/rtl8187_dev.c
---- linux-2.6.23.noarch/drivers/net/wireless/rtl8187_dev.c.orig 2008-01-17 15:21:43.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rtl8187_dev.c 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rtl8187_dev.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rtl8187_dev.c 2008-01-17 16:46:55.000000000 -0500
@@ -150,7 +150,8 @@ static int rtl8187_tx(struct ieee80211_h
flags |= RTL8187_TX_FLAG_MORE_FRAG;
if (control->flags & IEEE80211_TXCTL_USE_RTS_CTS) {
@@ -8437,8 +8442,8 @@
rtl818x_iowrite8(priv, &priv->map->BSSID[i], conf->bssid[i]);
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/dev.h.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/dev.h
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/dev.h.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/dev.h 2008-01-17 15:23:51.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/dev.h.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/dev.h 2008-01-17 16:46:55.000000000 -0500
@@ -102,7 +102,6 @@ struct lbs_private {
int mesh_open;
int infra_open;
@@ -8457,8 +8462,8 @@
/* protected with big lock */
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 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/wext.c 2008-01-17 15:23:51.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/wext.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/wext.c 2008-01-17 16:46:55.000000000 -0500
@@ -2070,17 +2070,11 @@ void lbs_get_fwversion(struct lbs_privat
mutex_lock(&priv->lock);
@@ -8483,8 +8488,8 @@
mutex_unlock(&priv->lock);
snprintf(fwversion, maxlen, fwver);
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/rx.c.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/rx.c
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/rx.c.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/rx.c 2008-01-17 15:23:51.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/rx.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/rx.c 2008-01-17 16:46:55.000000000 -0500
@@ -247,7 +247,10 @@ int lbs_process_rxed_packet(struct lbs_p
priv->stats.rx_packets++;
@@ -8498,8 +8503,8 @@
ret = 0;
done:
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/main.c.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/main.c
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/main.c.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/main.c 2008-01-17 15:25:49.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/main.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/main.c 2008-01-17 16:46:55.000000000 -0500
@@ -388,6 +388,8 @@ static int lbs_dev_open(struct net_devic
struct lbs_private *priv = (struct lbs_private *) dev->priv ;
int ret = 0;
@@ -8972,8 +8977,8 @@
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/cmd.c.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/cmd.c
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/cmd.c.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/cmd.c 2008-01-17 15:34:05.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/cmd.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/cmd.c 2008-01-17 16:46:55.000000000 -0500
@@ -59,13 +59,24 @@ int lbs_update_hw_spec(struct lbs_privat
goto out;
@@ -9006,8 +9011,8 @@
cmd.hwifversion, cmd.version);
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/if_usb.c.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/if_usb.c
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/if_usb.c.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/if_usb.c 2008-01-17 15:23:51.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/if_usb.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/if_usb.c 2008-01-17 16:46:55.000000000 -0500
@@ -104,12 +104,13 @@ static void if_usb_free(struct if_usb_ca
static void if_usb_setup_firmware(struct lbs_private *priv)
@@ -9033,8 +9038,8 @@
if_usb_submit_rx_urb(cardp);
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/hostcmd.h.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/hostcmd.h
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/hostcmd.h.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/hostcmd.h 2008-01-17 15:23:51.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/hostcmd.h.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/hostcmd.h 2008-01-17 16:46:55.000000000 -0500
@@ -136,8 +136,8 @@ struct cmd_ds_get_hw_spec {
/* Number of antenna used */
__le16 nr_antenna;
@@ -9047,8 +9052,8 @@
/* Base Address of TxPD queue */
__le32 wcb_base;
diff -up linux-2.6.23.noarch/drivers/net/wireless/libertas/if_usb.h.orig linux-2.6.23.noarch/drivers/net/wireless/libertas/if_usb.h
---- linux-2.6.23.noarch/drivers/net/wireless/libertas/if_usb.h.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/libertas/if_usb.h 2008-01-17 15:23:51.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/libertas/if_usb.h.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/libertas/if_usb.h 2008-01-17 16:46:55.000000000 -0500
@@ -70,6 +70,7 @@ struct if_usb_card {
uint8_t fwfinalblk;
uint8_t surprise_removed;
@@ -9058,8 +9063,8 @@
/** fwheader */
diff -up linux-2.6.23.noarch/drivers/net/wireless/rtl8187.h.orig linux-2.6.23.noarch/drivers/net/wireless/rtl8187.h
---- linux-2.6.23.noarch/drivers/net/wireless/rtl8187.h.orig 2008-01-17 15:21:43.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rtl8187.h 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rtl8187.h.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rtl8187.h 2008-01-17 16:46:55.000000000 -0500
@@ -66,7 +66,7 @@ struct rtl8187_priv {
struct rtl818x_csr *map;
const struct rtl818x_rf_ops *rf;
@@ -9070,8 +9075,8 @@
/* rtl8187 specific */
struct ieee80211_channel channels[14];
diff -up linux-2.6.23.noarch/drivers/net/wireless/wavelan.p.h.orig linux-2.6.23.noarch/drivers/net/wireless/wavelan.p.h
---- linux-2.6.23.noarch/drivers/net/wireless/wavelan.p.h.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/wavelan.p.h 2008-01-17 15:23:54.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/wavelan.p.h.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/wavelan.p.h 2008-01-17 16:46:55.000000000 -0500
@@ -400,7 +400,6 @@
*/
#undef SET_PSA_CRC /* Calculate and set the CRC on PSA (slower) */
@@ -9081,8 +9086,8 @@
#define MULTICAST_AVOID /* Avoid extra multicast (I'm sceptical). */
#undef SET_MAC_ADDRESS /* Experimental */
diff -up linux-2.6.23.noarch/drivers/net/wireless/wavelan_cs.c.orig linux-2.6.23.noarch/drivers/net/wireless/wavelan_cs.c
---- linux-2.6.23.noarch/drivers/net/wireless/wavelan_cs.c.orig 2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch/drivers/net/wireless/wavelan_cs.c 2008-01-17 15:23:54.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/wavelan_cs.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/wavelan_cs.c 2008-01-17 16:46:55.000000000 -0500
@@ -71,27 +71,6 @@ static void wv_nwid_filter(unsigned char
* (wavelan modem or i82593)
*/
@@ -9131,8 +9136,8 @@
/* Reset the pcmcia interface */
if(wv_pcmcia_reset(dev) == FALSE)
diff -up linux-2.6.23.noarch/drivers/net/wireless/rtl8180_dev.c.orig linux-2.6.23.noarch/drivers/net/wireless/rtl8180_dev.c
---- linux-2.6.23.noarch/drivers/net/wireless/rtl8180_dev.c.orig 2008-01-17 15:21:43.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rtl8180_dev.c 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rtl8180_dev.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rtl8180_dev.c 2008-01-17 16:46:55.000000000 -0500
@@ -236,7 +236,8 @@ static int rtl8180_tx(struct ieee80211_h
kmemdup(control, sizeof(*control), GFP_ATOMIC);
@@ -9178,8 +9183,8 @@
rtl818x_iowrite8(priv, &priv->map->BSSID[i], conf->bssid[i]);
diff -up linux-2.6.23.noarch/drivers/net/wireless/rtl8180.h.orig linux-2.6.23.noarch/drivers/net/wireless/rtl8180.h
---- linux-2.6.23.noarch/drivers/net/wireless/rtl8180.h.orig 2008-01-17 15:21:43.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rtl8180.h 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rtl8180.h.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rtl8180.h 2008-01-17 16:46:55.000000000 -0500
@@ -91,7 +91,7 @@ struct rtl8180_priv {
struct rtl818x_csr __iomem *map;
const struct rtl818x_rf_ops *rf;
@@ -9190,8 +9195,8 @@
/* rtl8180 driver specific */
spinlock_t lock;
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-commands.h.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-commands.h
---- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-commands.h.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-commands.h 2008-01-17 15:23:51.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-commands.h.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-commands.h 2008-01-17 16:46:55.000000000 -0500
@@ -508,8 +508,8 @@ struct iwl3945_qosparam_cmd {
#define IWL_STATION_COUNT 32 /* MAX(3945,4965)*/
#define IWL_INVALID_STATION 255
@@ -9410,8 +9415,8 @@
/* Can abort will notify by complete notification with abort status. */
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-commands.h.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-commands.h
---- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-commands.h.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-commands.h 2008-01-17 15:23:51.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-commands.h.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-commands.h 2008-01-17 16:46:55.000000000 -0500
@@ -492,18 +492,18 @@ enum {
};
@@ -9699,8 +9704,8 @@
* and CCK) counter */
__le32 beacon_rssi_a;
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 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c 2008-01-17 15:23:51.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.c 2008-01-17 16:46:55.000000000 -0500
@@ -103,7 +103,7 @@ struct iwl4965_scale_tbl_info {
*
* Pointer to this gets passed back and forth between driver and mac80211.
@@ -11232,8 +11237,8 @@
void iwl4965_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id)
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 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.h 2008-01-17 15:23:51.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.h.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.h 2008-01-17 16:46:55.000000000 -0500
@@ -86,18 +86,18 @@ enum {
};
@@ -11275,8 +11280,8 @@
#define IWL_INVALID_VALUE -1
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 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c 2008-01-17 15:23:51.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945.c 2008-01-17 16:46:55.000000000 -0500
@@ -265,7 +265,7 @@ void iwl3945_add_radiotap(struct iwl3945
if (skb_headroom(skb) < sizeof(*iwl3945_rt)) {
if (net_ratelimit())
@@ -11315,8 +11320,8 @@
IWL_DEBUG_INFO("SKU OP mode is mrc\n");
iwl3945_set_bit(priv, CSR_HW_IF_CONFIG_REG,
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-debug.h.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-debug.h
---- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-debug.h.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-debug.h 2008-01-17 15:23:51.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-debug.h.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-debug.h 2008-01-17 16:46:55.000000000 -0500
@@ -75,44 +75,44 @@ static inline void IWL_DEBUG_LIMIT(int l
*
*/
@@ -11401,8 +11406,8 @@
#define IWL_ERROR(f, a...) printk(KERN_ERR DRV_NAME ": " f, ## a)
#define IWL_WARNING(f, a...) printk(KERN_WARNING DRV_NAME ": " f, ## a)
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 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c 2008-01-17 15:27:53.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig 2008-01-17 16:46:53.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c 2008-01-17 16:46:55.000000000 -0500
@@ -90,7 +90,7 @@ int iwl4965_param_amsdu_size_8K; /* de
#define VS
#endif
@@ -12190,8 +12195,8 @@
}
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 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c 2008-01-17 15:23:51.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c.orig 2008-01-17 16:46:54.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965.c 2008-01-17 16:46:55.000000000 -0500
@@ -505,11 +505,6 @@ int iwl4965_hw_nic_init(struct iwl4965_p
spin_unlock_irqrestore(&priv->lock, flags);
@@ -12572,8 +12577,8 @@
#endif /* CONFIG_IWL4965_HT */
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-debug.h.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-debug.h
---- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-debug.h.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-debug.h 2008-01-17 15:23:51.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-debug.h.orig 2008-01-17 16:46:54.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-debug.h 2008-01-17 16:46:55.000000000 -0500
@@ -75,44 +75,44 @@ static inline void IWL_DEBUG_LIMIT(int l
*
*/
@@ -12658,8 +12663,8 @@
#define IWL_ERROR(f, a...) printk(KERN_ERR DRV_NAME ": " f, ## a)
#define IWL_WARNING(f, a...) printk(KERN_WARNING DRV_NAME ": " f, ## a)
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 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.h 2008-01-17 15:23:51.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.h.orig 2008-01-17 16:46:54.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-rs.h 2008-01-17 16:46:55.000000000 -0500
@@ -73,19 +73,19 @@ enum {
};
@@ -12703,8 +12708,8 @@
#define IWL_INVALID_VALUE -1
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 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/Kconfig 2008-01-17 15:23:51.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/Kconfig.orig 2008-01-17 16:46:54.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/Kconfig 2008-01-17 16:46:55.000000000 -0500
@@ -9,17 +9,15 @@ config IWL4965
This driver uses the kernel's mac80211 subsystem.
@@ -12750,8 +12755,8 @@
If you want to compile the driver as a module ( = code which can be
inserted in and remvoed from the running kernel whenever you want),
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 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-hw.h 2008-01-17 15:23:51.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-hw.h.orig 2008-01-17 16:46:54.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965-hw.h 2008-01-17 16:46:55.000000000 -0500
@@ -461,17 +461,17 @@ struct iwl4965_eeprom {
/* interrupt flags in INTA, set by uCode or hardware (e.g. dma),
@@ -12810,8 +12815,8 @@
/*
* Queue (x) Write Pointers (indexes, really!), one for each Tx queue.
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 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965.h 2008-01-17 15:23:51.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965.h.orig 2008-01-17 16:46:54.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-4965.h 2008-01-17 16:46:55.000000000 -0500
@@ -758,10 +758,6 @@ extern int iwl4965_tx_queue_update_wr_pt
extern void iwl4965_add_station(struct iwl4965_priv *priv, const u8 *addr,
int is_ap);
@@ -12855,8 +12860,8 @@
/* Current association information needed to configure the
* hardware */
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 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h.orig 2008-01-17 16:46:54.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945.h 2008-01-17 16:46:55.000000000 -0500
@@ -863,7 +863,7 @@ struct iwl3945_priv {
u32 timestamp1;
u16 beacon_int;
@@ -12867,8 +12872,8 @@
/* Current association information needed to configure the
* hardware */
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 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-hw.h 2008-01-17 15:23:51.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-hw.h.orig 2008-01-17 16:46:54.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-hw.h 2008-01-17 16:46:55.000000000 -0500
@@ -369,17 +369,17 @@ struct iwl3945_eeprom {
/* interrupt flags in INTA, set by uCode or hardware (e.g. dma),
@@ -12937,8 +12942,8 @@
#define TFD_TX_CMD_SLOTS 256
#define TFD_CMD_SLOTS 32
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 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c 2008-01-17 15:26:48.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig 2008-01-17 16:46:54.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c 2008-01-17 16:46:55.000000000 -0500
@@ -91,7 +91,7 @@ int iwl3945_param_queues_num = IWL_MAX_N
#define VS
#endif
@@ -13599,8 +13604,8 @@
}
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-helpers.h.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-helpers.h
---- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-helpers.h.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-helpers.h 2008-01-17 15:23:51.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-helpers.h.orig 2008-01-17 16:46:54.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-helpers.h 2008-01-17 16:46:55.000000000 -0500
@@ -252,4 +252,27 @@ static inline unsigned long elapsed_jiff
return end + (MAX_JIFFY_OFFSET - start);
}
@@ -13630,8 +13635,8 @@
+
#endif /* __iwl_helpers_h__ */
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 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.c 2008-01-17 15:23:51.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.c.orig 2008-01-17 16:46:54.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl-3945-rs.c 2008-01-17 16:46:55.000000000 -0500
@@ -52,7 +52,7 @@ struct iwl3945_rate_scale_data {
unsigned long stamp;
};
@@ -14166,8 +14171,8 @@
void iwl3945_rate_control_register(struct ieee80211_hw *hw)
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 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00.h 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00.h.orig 2008-01-17 16:46:54.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00.h 2008-01-17 16:46:55.000000000 -0500
@@ -372,7 +372,7 @@ struct interface {
* to us by the 80211 stack, and is used to request
* new beacons.
@@ -14199,8 +14204,8 @@
const struct ieee80211_tx_queue_params *params);
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 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c 2008-01-17 15:23:54.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c.orig 2008-01-17 16:46:54.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00usb.c 2008-01-17 16:46:55.000000000 -0500
@@ -257,6 +257,13 @@ static void rt2x00usb_interrupt_rxdone(s
if (urb->actual_length < entry->ring->desc_size || urb->status)
goto skip_entry;
@@ -14260,8 +14265,8 @@
/*
* Allocate DMA
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 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c 2008-01-17 15:23:52.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c.orig 2008-01-17 16:46:54.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00dev.c 2008-01-17 16:46:55.000000000 -0500
@@ -481,10 +481,17 @@ static void rt2x00lib_configuration_sche
{
struct rt2x00_dev *rt2x00dev =
@@ -14305,8 +14310,8 @@
ring->queue_idx = index++;
ring->tx_params.aifs = 2;
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 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2400pci.c 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2400pci.c.orig 2008-01-17 16:46:54.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2400pci.c 2008-01-17 16:46:55.000000000 -0500
@@ -1522,7 +1522,7 @@ static const struct ieee80211_ops rt2400
.configure_filter = rt2400pci_configure_filter,
.get_stats = rt2x00mac_get_stats,
@@ -14317,8 +14322,8 @@
.get_tx_stats = rt2x00mac_get_tx_stats,
.get_tsf = rt2400pci_get_tsf,
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 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.c 2008-01-17 15:23:52.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.c.orig 2008-01-17 16:46:54.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500usb.c 2008-01-17 16:46:55.000000000 -0500
@@ -1140,15 +1140,12 @@ static void rt2500usb_fill_rxdone(struct
desc->my_bss = !!rt2x00_get_field32(word0, RXD_W0_MY_BSS);
@@ -14348,8 +14353,8 @@
.get_tx_stats = rt2x00mac_get_tx_stats,
.beacon_update = rt2500usb_beacon_update,
diff -up linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00mac.c.orig linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00mac.c
---- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00mac.c.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00mac.c 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00mac.c.orig 2008-01-17 16:46:54.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2x00mac.c 2008-01-17 16:46:55.000000000 -0500
@@ -181,7 +181,7 @@ int rt2x00mac_add_interface(struct ieee8
is_interface_present(intf))
return -ENOBUFS;
@@ -14412,8 +14417,8 @@
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-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.c 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.c.orig 2008-01-17 16:46:54.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt2500pci.c 2008-01-17 16:46:55.000000000 -0500
@@ -1832,7 +1832,7 @@ static const struct ieee80211_ops rt2500
.configure_filter = rt2500pci_configure_filter,
.get_stats = rt2x00mac_get_stats,
@@ -14424,8 +14429,8 @@
.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-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.c 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.c.orig 2008-01-17 16:46:54.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt61pci.c 2008-01-17 16:46:55.000000000 -0500
@@ -2451,7 +2451,7 @@ static const struct ieee80211_ops rt61pc
.configure_filter = rt61pci_configure_filter,
.get_stats = rt2x00mac_get_stats,
@@ -14436,8 +14441,8 @@
.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-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.c 2008-01-17 15:23:54.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.c.orig 2008-01-17 16:46:54.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/rt2x00/rt73usb.c 2008-01-17 16:46:55.000000000 -0500
@@ -1398,15 +1398,12 @@ static void rt73usb_fill_rxdone(struct d
desc->my_bss = !!rt2x00_get_field32(word0, RXD_W0_MY_BSS);
@@ -14468,8 +14473,8 @@
.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-17 15:21:43.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/hw.c 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/ath5k/hw.c.orig 2008-01-17 16:46:54.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/hw.c 2008-01-17 16:46:55.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. */
@@ -14495,8 +14500,8 @@
/*
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-17 15:21:43.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.c 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-01-17 16:46:54.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.c 2008-01-17 16:46:55.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,
@@ -14554,8 +14559,8 @@
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-17 15:21:43.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.h 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-01-17 16:46:54.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/ath5k/base.h 2008-01-17 16:46:55.000000000 -0500
@@ -123,7 +123,7 @@ struct ath5k_softc {
unsigned int curmode; /* current phy mode */
struct ieee80211_channel *curchan; /* current h/w channel */
@@ -14566,8 +14571,8 @@
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-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/net/wireless/adm8211.c 2008-01-17 15:22:10.000000000 -0500
+--- linux-2.6.23.noarch/drivers/net/wireless/adm8211.c.orig 2008-01-17 16:46:54.000000000 -0500
++++ linux-2.6.23.noarch/drivers/net/wireless/adm8211.c 2008-01-17 16:46:55.000000000 -0500
@@ -1312,7 +1312,8 @@ static int adm8211_config(struct ieee802
return 0;
}
@@ -14579,8 +14584,8 @@
{
struct adm8211_priv *priv = dev->priv;
diff -up linux-2.6.23.noarch/drivers/ssb/pci.c.orig linux-2.6.23.noarch/drivers/ssb/pci.c
---- linux-2.6.23.noarch/drivers/ssb/pci.c.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/ssb/pci.c 2008-01-17 15:23:54.000000000 -0500
+--- linux-2.6.23.noarch/drivers/ssb/pci.c.orig 2008-01-17 16:46:54.000000000 -0500
++++ linux-2.6.23.noarch/drivers/ssb/pci.c 2008-01-17 16:46:55.000000000 -0500
@@ -377,6 +377,8 @@ static void sprom_extract_r123(struct ss
SSB_SPROM1_ITSSI_A_SHIFT);
SPEX(itssi_bg, SSB_SPROM1_ITSSI, SSB_SPROM1_ITSSI_BG, 0);
@@ -14599,8 +14604,8 @@
SSB_SPROM4_ANTAVAIL_A_SHIFT);
SPEX(ant_available_bg, SSB_SPROM4_ANTAVAIL, SSB_SPROM4_ANTAVAIL_BG,
diff -up linux-2.6.23.noarch/Documentation/feature-removal-schedule.txt.orig linux-2.6.23.noarch/Documentation/feature-removal-schedule.txt
---- linux-2.6.23.noarch/Documentation/feature-removal-schedule.txt.orig 2008-01-17 15:21:42.000000000 -0500
-+++ linux-2.6.23.noarch/Documentation/feature-removal-schedule.txt 2008-01-17 15:23:51.000000000 -0500
+--- linux-2.6.23.noarch/Documentation/feature-removal-schedule.txt.orig 2008-01-17 16:46:54.000000000 -0500
++++ linux-2.6.23.noarch/Documentation/feature-removal-schedule.txt 2008-01-17 16:46:55.000000000 -0500
@@ -341,3 +341,12 @@ Why: This algorithm was provided for ref
responsiveness and performance and has some serious flaws. It has been
replaced by rc80211-pid.
More information about the fedora-extras-commits
mailing list