rpms/kernel/F-9 kernel.spec, 1.678, 1.679 linux-2.6-wireless-pending.patch, 1.50, 1.51 linux-2.6-wireless.patch, 1.39, 1.40
John W. Linville (linville)
fedora-extras-commits at redhat.com
Sat Jun 14 00:10:48 UTC 2008
- Previous message (by thread): rpms/kernel/devel kernel.spec, 1.691, 1.692 linux-2.6-wireless-pending.patch, 1.52, 1.53 linux-2.6-wireless.patch, 1.40, 1.41
- Next message (by thread): rpms/kernel/F-8 kernel.spec, 1.467, 1.468 linux-2.6-wireless-pending.patch, 1.47, 1.48 linux-2.6-wireless.patch, 1.41, 1.42
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: linville
Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2295
Modified Files:
kernel.spec linux-2.6-wireless-pending.patch
linux-2.6-wireless.patch
Log Message:
Upstream wireless fixes from 2008-06-13
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.678
retrieving revision 1.679
diff -u -r1.678 -r1.679
--- kernel.spec 13 Jun 2008 14:13:59 -0000 1.678
+++ kernel.spec 14 Jun 2008 00:09:51 -0000 1.679
@@ -1849,6 +1849,10 @@
%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
%changelog
+* Fri Jun 13 2008 John W. Linville <linville at redhat.com> 2.6.25.6-60
+- Upstream wireless fixes from 2008-06-13
+ (http://marc.info/?l=linux-wireless&m=121339101523260&w=2)
+
* Tue Jun 10 2008 Roland McGrath <roland at redhat.com> - 2.6.25.6-58
- Fix i386 syscall tracing and PTRACE_SYSEMU, had broken UML. (#449909)
linux-2.6-wireless-pending.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.50 -r 1.51 linux-2.6-wireless-pending.patch
Index: linux-2.6-wireless-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-wireless-pending.patch,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- linux-2.6-wireless-pending.patch 10 Jun 2008 20:21:32 -0000 1.50
+++ linux-2.6-wireless-pending.patch 14 Jun 2008 00:09:51 -0000 1.51
@@ -3753,8 +3753,8 @@
Signed-off-by: John W. Linville <linville at tuxdriver.com>
diff -up linux-2.6.25.noarch/drivers/net/Kconfig.orig linux-2.6.25.noarch/drivers/net/Kconfig
---- linux-2.6.25.noarch/drivers/net/Kconfig.orig 2008-06-10 15:30:25.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/Kconfig 2008-06-10 16:01:28.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/Kconfig.orig 2008-06-13 19:33:10.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/Kconfig 2008-06-13 19:44:34.000000000 -0400
@@ -2387,6 +2387,19 @@ config GELIC_WIRELESS
the driver automatically distinguishes the models, you can
safely enable this option even if you have a wireless-less model.
@@ -3777,7 +3777,7 @@
depends on FSL_SOC
diff -up linux-2.6.25.noarch/drivers/net/ps3_gelic_net.c.orig linux-2.6.25.noarch/drivers/net/ps3_gelic_net.c
--- linux-2.6.25.noarch/drivers/net/ps3_gelic_net.c.orig 2008-04-16 22:49:44.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/ps3_gelic_net.c 2008-06-10 16:01:28.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/ps3_gelic_net.c 2008-06-13 19:44:34.000000000 -0400
@@ -110,7 +110,7 @@ static void gelic_card_get_ether_port_st
void gelic_card_up(struct gelic_card *card)
{
@@ -3825,7 +3825,7 @@
return card;
diff -up linux-2.6.25.noarch/drivers/net/ps3_gelic_net.h.orig linux-2.6.25.noarch/drivers/net/ps3_gelic_net.h
--- linux-2.6.25.noarch/drivers/net/ps3_gelic_net.h.orig 2008-04-16 22:49:44.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/ps3_gelic_net.h 2008-06-10 16:01:28.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/ps3_gelic_net.h 2008-06-13 19:44:34.000000000 -0400
@@ -278,7 +278,7 @@ struct gelic_card {
wait_queue_head_t waitq;
@@ -3837,7 +3837,7 @@
u64 ether_port_status;
diff -up linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.c.orig linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.c
--- linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.c.orig 2008-06-10 15:00:23.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.c 2008-06-10 16:01:28.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.c 2008-06-13 19:44:34.000000000 -0400
@@ -45,7 +45,8 @@
#include "ps3_gelic_wireless.h"
@@ -4381,7 +4381,7 @@
destroy_workqueue(wl->event_queue);
diff -up linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.h.orig linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.h
--- linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.h.orig 2008-04-16 22:49:44.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.h 2008-06-10 16:01:28.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.h 2008-06-13 19:44:34.000000000 -0400
@@ -241,7 +241,7 @@ enum gelic_wl_assoc_state {
#define GELIC_WEP_KEYS 4
struct gelic_wl_info {
@@ -4411,8 +4411,8 @@
struct iw_statistics iwstat;
};
diff -up linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig linux-2.6.25.noarch/drivers/net/wireless/adm8211.c
---- linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig 2008-06-10 15:46:53.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-06-10 15:46:59.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig 2008-06-13 19:33:05.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-06-13 19:44:34.000000000 -0400
@@ -306,11 +306,10 @@ static int adm8211_get_tx_stats(struct i
struct ieee80211_tx_queue_stats *stats)
{
@@ -4561,8 +4561,8 @@
return 0;
diff -up linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig linux-2.6.25.noarch/drivers/net/wireless/adm8211.h
---- linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig 2008-06-10 15:46:53.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-06-10 15:46:59.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig 2008-06-13 19:33:05.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-06-13 19:44:34.000000000 -0400
@@ -443,7 +443,6 @@ struct adm8211_rx_ring_info {
struct adm8211_tx_ring_info {
struct sk_buff *skb;
@@ -4572,8 +4572,8 @@
};
diff -up linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig linux-2.6.25.noarch/drivers/net/wireless/airo.c
---- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-06-10 15:46:53.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-06-10 15:46:59.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-06-13 19:33:05.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-06-13 19:44:34.000000000 -0400
@@ -1148,7 +1148,6 @@ static u8 airo_dbm_to_pct (tdsRssiEntry
static void airo_networks_free(struct airo_info *ai);
@@ -4742,8 +4742,8 @@
}
buffer = (u16*)skb_put (skb, len + hdrlen);
diff -up linux-2.6.25.noarch/drivers/net/wireless/arlan.h.orig linux-2.6.25.noarch/drivers/net/wireless/arlan.h
---- linux-2.6.25.noarch/drivers/net/wireless/arlan.h.orig 2008-06-10 15:46:53.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/arlan.h 2008-06-10 15:46:59.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/arlan.h.orig 2008-04-16 22:49:44.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/arlan.h 2008-06-13 19:44:34.000000000 -0400
@@ -330,7 +330,6 @@ struct TxParam
#define TX_RING_SIZE 2
/* Information that need to be kept for each board. */
@@ -4753,8 +4753,8 @@
struct arlan_shmem * conf;
diff -up linux-2.6.25.noarch/drivers/net/wireless/arlan-main.c.orig linux-2.6.25.noarch/drivers/net/wireless/arlan-main.c
---- linux-2.6.25.noarch/drivers/net/wireless/arlan-main.c.orig 2008-06-10 15:46:53.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/arlan-main.c 2008-06-10 15:46:59.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/arlan-main.c.orig 2008-04-16 22:49:44.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/arlan-main.c 2008-06-13 19:44:34.000000000 -0400
@@ -125,7 +125,7 @@ static inline int arlan_drop_tx(struct n
{
struct arlan_private *priv = netdev_priv(dev);
@@ -4839,8 +4839,8 @@
diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c
---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-06-10 15:46:53.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-06-10 16:01:28.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-06-13 19:33:05.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-06-13 19:44:34.000000000 -0400
@@ -167,8 +167,7 @@ static struct pci_driver ath5k_pci_drive
/*
* Prototypes - MAC 802.11 stack related functions
@@ -5130,8 +5130,8 @@
sc->bbuf->skb = NULL;
else
diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h
---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-06-10 15:46:53.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h 2008-06-10 15:46:59.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-06-13 19:33:05.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h 2008-06-13 19:44:34.000000000 -0400
@@ -60,7 +60,6 @@ struct ath5k_buf {
dma_addr_t daddr; /* physical addr of desc */
struct sk_buff *skb; /* skbuff for buf */
@@ -5151,8 +5151,8 @@
struct ieee80211_hw *hw; /* IEEE 802.11 common */
struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];
diff -up linux-2.6.25.noarch/drivers/net/wireless/atmel.c.orig linux-2.6.25.noarch/drivers/net/wireless/atmel.c
---- linux-2.6.25.noarch/drivers/net/wireless/atmel.c.orig 2008-06-10 15:46:53.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/atmel.c 2008-06-10 15:46:59.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/atmel.c.orig 2008-06-13 19:33:05.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/atmel.c 2008-06-13 19:44:34.000000000 -0400
@@ -433,7 +433,6 @@ struct atmel_private {
struct net_device *dev;
struct device *sys_dev;
@@ -5332,8 +5332,8 @@
dev->do_ioctl = atmel_ioctl;
dev->irq = irq;
diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h.orig linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h
---- linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h.orig 2008-06-10 15:46:53.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h 2008-06-10 15:46:59.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h.orig 2008-06-13 19:33:05.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h 2008-06-13 19:44:34.000000000 -0400
@@ -410,8 +410,7 @@ enum {
#define B43_IRQ_TIMEOUT 0x80000000
@@ -5371,7 +5371,7 @@
/* Device specific rate values.
* The actual values defined here are (rate_in_mbps * 2).
* Some code depends on this. Don't change it. */
-@@ -734,7 +753,6 @@ struct b43_wl {
+@@ -733,7 +752,6 @@ struct b43_wl {
/* The beacon we are currently using (AP or IBSS mode).
* This beacon stuff is protected by the irq_lock. */
struct sk_buff *current_beacon;
@@ -5379,7 +5379,7 @@
bool beacon0_uploaded;
bool beacon1_uploaded;
bool beacon_templates_virgin; /* Never wrote the templates? */
-@@ -768,6 +786,13 @@ struct b43_firmware {
+@@ -767,6 +785,13 @@ struct b43_firmware {
u16 rev;
/* Firmware patchlevel */
u16 patch;
@@ -5393,7 +5393,7 @@
};
/* Device (802.11 core) initialization status. */
-@@ -941,22 +966,6 @@ static inline bool __b43_warn_on_dummy(b
+@@ -940,22 +965,6 @@ static inline bool __b43_warn_on_dummy(b
# define B43_WARN_ON(x) __b43_warn_on_dummy(unlikely(!!(x)))
#endif
@@ -5417,8 +5417,8 @@
#define INT_TO_Q52(i) ((i) << 2)
/* Convert a Q5.2 value to an integer (precision loss!) */
diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/debugfs.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43/debugfs.c
---- linux-2.6.25.noarch/drivers/net/wireless/b43/debugfs.c.orig 2008-06-10 15:46:53.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/b43/debugfs.c 2008-06-10 15:46:59.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/b43/debugfs.c.orig 2008-04-16 22:49:44.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/b43/debugfs.c 2008-06-13 19:44:35.000000000 -0400
@@ -270,24 +270,22 @@ static int restart_write_file(struct b43
return err;
}
@@ -5544,8 +5544,8 @@
#undef add_dyn_dbg
}
diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/debugfs.h.orig linux-2.6.25.noarch/drivers/net/wireless/b43/debugfs.h
---- linux-2.6.25.noarch/drivers/net/wireless/b43/debugfs.h.orig 2008-06-10 15:46:53.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/b43/debugfs.h 2008-06-10 15:46:59.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/b43/debugfs.h.orig 2008-04-16 22:49:44.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/b43/debugfs.h 2008-06-13 19:44:35.000000000 -0400
[...2160 lines suppressed...]
++++ linux-2.6.25.noarch/net/mac80211/rc80211_pid_algo.c 2008-06-13 19:44:37.000000000 -0400
@@ -237,8 +237,7 @@ static void rate_control_pid_sample(stru
}
@@ -50847,8 +50848,8 @@
#ifdef CONFIG_MAC80211_DEBUGFS
rate_control_pid_event_tx_rate(
diff -up linux-2.6.25.noarch/net/mac80211/rc80211_pid_debugfs.c.orig linux-2.6.25.noarch/net/mac80211/rc80211_pid_debugfs.c
---- linux-2.6.25.noarch/net/mac80211/rc80211_pid_debugfs.c.orig 2008-06-10 15:46:54.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/rc80211_pid_debugfs.c 2008-06-10 15:47:00.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/rc80211_pid_debugfs.c.orig 2008-06-13 19:33:08.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/rc80211_pid_debugfs.c 2008-06-13 19:44:37.000000000 -0400
@@ -39,11 +39,11 @@ static void rate_control_pid_event(struc
}
@@ -50875,8 +50876,8 @@
case RC_PID_EVENT_TYPE_RATE_CHANGE:
p += snprintf(pb + p, length - p, "rate_change %d %d",
diff -up linux-2.6.25.noarch/net/mac80211/rc80211_pid.h.orig linux-2.6.25.noarch/net/mac80211/rc80211_pid.h
---- linux-2.6.25.noarch/net/mac80211/rc80211_pid.h.orig 2008-06-10 15:46:54.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/rc80211_pid.h 2008-06-10 15:47:00.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/rc80211_pid.h.orig 2008-04-16 22:49:44.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/rc80211_pid.h 2008-06-13 19:44:37.000000000 -0400
@@ -61,7 +61,7 @@ enum rc_pid_event_type {
union rc_pid_event_data {
/* RC_PID_EVENT_TX_STATUS */
@@ -50896,8 +50897,8 @@
void rate_control_pid_event_rate_change(struct rc_pid_event_buffer *buf,
int index, int rate);
diff -up linux-2.6.25.noarch/net/mac80211/rx.c.orig linux-2.6.25.noarch/net/mac80211/rx.c
---- linux-2.6.25.noarch/net/mac80211/rx.c.orig 2008-06-10 15:46:54.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/rx.c 2008-06-10 15:47:00.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/rx.c.orig 2008-06-13 19:33:08.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/rx.c 2008-06-13 19:44:37.000000000 -0400
@@ -77,6 +77,134 @@ static inline int should_drop_frame(stru
return 0;
}
@@ -51369,8 +51370,8 @@
rcu_read_unlock();
}
diff -up linux-2.6.25.noarch/net/mac80211/sta_info.c.orig linux-2.6.25.noarch/net/mac80211/sta_info.c
---- linux-2.6.25.noarch/net/mac80211/sta_info.c.orig 2008-06-10 15:46:54.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/sta_info.c 2008-06-10 15:47:00.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/sta_info.c.orig 2008-06-13 19:33:08.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/sta_info.c 2008-06-13 19:44:37.000000000 -0400
@@ -202,14 +202,12 @@ void sta_info_destroy(struct sta_info *s
dev_kfree_skb_any(skb);
@@ -51457,8 +51458,8 @@
diff -up linux-2.6.25.noarch/net/mac80211/sta_info.h.orig linux-2.6.25.noarch/net/mac80211/sta_info.h
---- linux-2.6.25.noarch/net/mac80211/sta_info.h.orig 2008-06-10 15:46:54.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/sta_info.h 2008-06-10 15:47:00.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/sta_info.h.orig 2008-06-13 19:33:08.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/sta_info.h 2008-06-13 19:44:37.000000000 -0400
@@ -32,7 +32,7 @@
* @WLAN_STA_WDS: Station is one of our WDS peers.
* @WLAN_STA_PSPOLL: Station has just PS-polled us.
@@ -51618,8 +51619,8 @@
/* Maximum number of concurrently registered stations */
#define MAX_STA_COUNT 2007
diff -up linux-2.6.25.noarch/net/mac80211/tkip.c.orig linux-2.6.25.noarch/net/mac80211/tkip.c
---- linux-2.6.25.noarch/net/mac80211/tkip.c.orig 2008-06-10 15:46:54.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/tkip.c 2008-06-10 15:47:00.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/tkip.c.orig 2008-06-13 19:33:08.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/tkip.c 2008-06-13 19:44:37.000000000 -0400
@@ -6,25 +6,23 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
@@ -52000,8 +52001,8 @@
-
-
diff -up linux-2.6.25.noarch/net/mac80211/tkip.h.orig linux-2.6.25.noarch/net/mac80211/tkip.h
---- linux-2.6.25.noarch/net/mac80211/tkip.h.orig 2008-06-10 15:46:54.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/tkip.h 2008-06-10 15:47:00.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/tkip.h.orig 2008-06-13 19:33:08.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/tkip.h 2008-06-13 19:44:37.000000000 -0400
@@ -13,12 +13,8 @@
#include <linux/crypto.h>
#include "key.h"
@@ -52018,8 +52019,8 @@
struct ieee80211_key *key,
u8 *pos, size_t payload_len, u8 *ta);
diff -up linux-2.6.25.noarch/net/mac80211/tx.c.orig linux-2.6.25.noarch/net/mac80211/tx.c
---- linux-2.6.25.noarch/net/mac80211/tx.c.orig 2008-06-10 15:46:54.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/tx.c 2008-06-10 16:01:28.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/tx.c.orig 2008-06-13 19:33:08.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/tx.c 2008-06-13 19:44:37.000000000 -0400
@@ -91,11 +91,12 @@ static u16 ieee80211_duration(struct iee
int next_frag_len)
{
@@ -53418,8 +53419,8 @@
return skb;
diff -up linux-2.6.25.noarch/net/mac80211/util.c.orig linux-2.6.25.noarch/net/mac80211/util.c
---- linux-2.6.25.noarch/net/mac80211/util.c.orig 2008-06-10 15:46:54.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/util.c 2008-06-10 15:47:00.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/util.c.orig 2008-06-13 19:33:08.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/util.c 2008-06-13 19:44:37.000000000 -0400
@@ -258,7 +258,7 @@ EXPORT_SYMBOL(ieee80211_generic_frame_du
__le16 ieee80211_rts_duration(struct ieee80211_hw *hw,
@@ -53550,8 +53551,8 @@
}
EXPORT_SYMBOL(ieee80211_wake_queues);
diff -up linux-2.6.25.noarch/net/mac80211/wep.c.orig linux-2.6.25.noarch/net/mac80211/wep.c
---- linux-2.6.25.noarch/net/mac80211/wep.c.orig 2008-06-10 15:46:54.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-06-10 16:01:28.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wep.c.orig 2008-06-13 19:33:08.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-06-13 19:44:37.000000000 -0400
@@ -93,13 +93,9 @@ static u8 *ieee80211_wep_add_iv(struct i
fc |= IEEE80211_FCTL_PROTECTED;
hdr->frame_control = cpu_to_le16(fc);
@@ -53597,8 +53598,8 @@
if (wep_encrypt_skb(tx, tx->skb) < 0) {
diff -up linux-2.6.25.noarch/net/mac80211/wep.h.orig linux-2.6.25.noarch/net/mac80211/wep.h
---- linux-2.6.25.noarch/net/mac80211/wep.h.orig 2008-06-10 15:46:54.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-06-10 15:47:00.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wep.h.orig 2008-06-13 19:33:08.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-06-13 19:44:37.000000000 -0400
@@ -26,7 +26,7 @@ int ieee80211_wep_encrypt(struct ieee802
struct ieee80211_key *key);
int ieee80211_wep_decrypt(struct ieee80211_local *local, struct sk_buff *skb,
@@ -53609,8 +53610,8 @@
ieee80211_rx_result
ieee80211_crypto_wep_decrypt(struct ieee80211_rx_data *rx);
diff -up linux-2.6.25.noarch/net/mac80211/wext.c.orig linux-2.6.25.noarch/net/mac80211/wext.c
---- linux-2.6.25.noarch/net/mac80211/wext.c.orig 2008-06-10 15:46:54.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-06-10 15:47:00.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wext.c.orig 2008-06-13 19:33:08.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-06-13 19:44:37.000000000 -0400
@@ -169,14 +169,26 @@ static int ieee80211_ioctl_giwrange(stru
range->num_encoding_sizes = 2;
range->max_encoding_tokens = NUM_DEFAULT_KEYS;
@@ -53644,7 +53645,7 @@
range->avg_qual.updated = local->wstats_flags;
range->enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2 |
-@@ -1007,8 +1019,8 @@ static struct iw_statistics *ieee80211_g
+@@ -1008,8 +1020,8 @@ static struct iw_statistics *ieee80211_g
wstats->qual.noise = 0;
wstats->qual.updated = IW_QUAL_ALL_INVALID;
} else {
@@ -53656,8 +53657,8 @@
wstats->qual.updated = local->wstats_flags;
}
diff -up linux-2.6.25.noarch/net/mac80211/wme.c.orig linux-2.6.25.noarch/net/mac80211/wme.c
---- linux-2.6.25.noarch/net/mac80211/wme.c.orig 2008-06-10 15:46:54.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-06-10 15:47:00.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wme.c.orig 2008-06-13 19:33:08.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-06-13 19:44:37.000000000 -0400
@@ -19,16 +19,22 @@
#include "wme.h"
@@ -54032,8 +54033,8 @@
if (requeue)
ieee80211_requeue(local, agg_queue);
diff -up linux-2.6.25.noarch/net/mac80211/wme.h.orig linux-2.6.25.noarch/net/mac80211/wme.h
---- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-06-10 15:46:54.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-06-10 15:47:00.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-06-13 19:33:08.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-06-13 19:44:37.000000000 -0400
@@ -31,7 +31,7 @@ static inline int WLAN_FC_IS_QOS_DATA(u1
return (fc & 0x8C) == 0x88;
}
@@ -54044,8 +54045,8 @@
int ieee80211_qdisc_installed(struct net_device *dev);
int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
diff -up linux-2.6.25.noarch/net/mac80211/wpa.c.orig linux-2.6.25.noarch/net/mac80211/wpa.c
---- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-06-10 15:46:54.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-06-10 16:01:28.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-06-13 19:33:08.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-06-13 19:44:37.000000000 -0400
@@ -79,6 +79,7 @@ ieee80211_tx_h_michael_mic_add(struct ie
struct sk_buff *skb = tx->skb;
int authenticator;
@@ -54291,8 +54292,8 @@
}
}
diff -up linux-2.6.25.noarch/net/wireless/core.c.orig linux-2.6.25.noarch/net/wireless/core.c
---- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-06-10 15:46:54.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/core.c 2008-06-10 15:47:00.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-06-13 19:33:09.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/core.c 2008-06-13 19:44:37.000000000 -0400
@@ -143,8 +143,11 @@ void cfg80211_put_dev(struct cfg80211_re
int cfg80211_dev_rename(struct cfg80211_registered_device *rdev,
char *newname)
@@ -54356,8 +54357,8 @@
/* exported functions */
diff -up linux-2.6.25.noarch/net/wireless/radiotap.c.orig linux-2.6.25.noarch/net/wireless/radiotap.c
---- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-06-10 15:46:54.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-06-10 15:47:00.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-04-16 22:49:44.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-06-13 19:44:37.000000000 -0400
@@ -59,23 +59,21 @@ int ieee80211_radiotap_iterator_init(
return -EINVAL;
linux-2.6-wireless.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.39 -r 1.40 linux-2.6-wireless.patch
Index: linux-2.6-wireless.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-wireless.patch,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- linux-2.6-wireless.patch 10 Jun 2008 20:21:32 -0000 1.39
+++ linux-2.6-wireless.patch 14 Jun 2008 00:09:51 -0000 1.40
@@ -1,3 +1,197 @@
+commit cb62eccd7d946f7fb92b8beb79988726ec92c227
+Author: Ivo van Doorn <ivdoorn at gmail.com>
+Date: Thu Jun 12 20:47:17 2008 +0200
+
+ rt2x00: Add D-link DWA111 support
+
+ Add new rt73usb USB ID for D-Link DWA111
+
+ Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 995ad6c5a415c9389d094d246ca1b305c1e31813
+Author: Tomas Winkler <tomas.winkler at intel.com>
+Date: Thu Jun 12 20:08:19 2008 +0300
+
+ mac80211: add missing new line in debug print HT_DEBUG
+
+ This patch adds '\n' in debug printk (wme.c HT DEBUG)
+
+ Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 5c5f9664d5284d8542062fed39e1f19b80db7aa5
+Author: Abhijeet Kolekar <abhijeet.kolekar at intel.com>
+Date: Thu Jun 12 09:47:16 2008 +0800
+
+ mac80211 : fix for iwconfig in ad-hoc mode
+
+ The patch checks interface status, if it is in IBSS_JOINED mode
+ show cell id it is associated with.
+
+ Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar at intel.com>
+ Signed-off-by: Zhu Yi <yi.zhu at intel.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit e6340361f9c70e84312caed98c6e058ac6234e9b
+Author: Michael Buesch <mb at bu3sch.de>
+Date: Thu Jun 12 15:33:13 2008 +0200
+
+ ssb: Fix coherent DMA mask for PCI devices
+
+ This fixes setting the coherent DMA mask for PCI devices.
+
+ Signed-off-by: Michael Buesch <mb at bu3sch.de>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 6847aa5cce6e22c3625a243b02909ac46aafa110
+Author: Randy Dunlap <randy.dunlap at oracle.com>
+Date: Wed Jun 11 13:32:22 2008 -0700
+
+ rt2x00: LEDS build failure
+
+ Config symbols that select LEDS_CLASS need to depend on NEW_LEDS so that
+ undefined symbols are not used in the build.
+
+ The alternative is to select NEW_LEDS, which some drivers do.
+
+ This patch fixes the led_* symbols build errors.
+
+ (.text+0x174cdc): undefined reference to `input_unregister_device'
+ (.text+0x174d9f): undefined reference to `input_allocate_device'
+ (.text+0x174e2d): undefined reference to `input_register_device'
+ (.text+0x174e53): undefined reference to `input_free_device'
+ rt2x00rfkill.c:(.text+0x176dc4): undefined reference to `input_allocate_polled_device'
+ rt2x00rfkill.c:(.text+0x176e8b): undefined reference to `input_event'
+ rt2x00rfkill.c:(.text+0x176e9f): undefined reference to `input_event'
+ (.text+0x176eca): undefined reference to `input_unregister_polled_device'
+ (.text+0x176efc): undefined reference to `input_free_polled_device'
+ (.text+0x176f37): undefined reference to `input_free_polled_device'
+ (.text+0x176fd8): undefined reference to `input_register_polled_device'
+ (.text+0x1772c0): undefined reference to `led_classdev_resume'
+ (.text+0x1772d4): undefined reference to `led_classdev_resume'
+ (.text+0x1772e8): undefined reference to `led_classdev_resume'
+ (.text+0x17730a): undefined reference to `led_classdev_suspend'
+ (.text+0x17731e): undefined reference to `led_classdev_suspend'
+ (.text+0x17732f): undefined reference to `led_classdev_suspend'
+ rt2x00leds.c:(.text+0x177348): undefined reference to `led_classdev_unregister'
+ rt2x00leds.c:(.text+0x1773c0): undefined reference to `led_classdev_register'
+ rfkill-input.c:(.text+0x209e4c): undefined reference to `input_close_device'
+ rfkill-input.c:(.text+0x209e53): undefined reference to `input_unregister_handle'
+ rfkill-input.c:(.text+0x209ea1): undefined reference to `input_register_handle'
+ rfkill-input.c:(.text+0x209eae): undefined reference to `input_open_device'
+ rfkill-input.c:(.text+0x209ebb): undefined reference to `input_unregister_handle'
+ rfkill-input.c:(.init.text+0x17405): undefined reference to `input_register_handler'
+ rfkill-input.c:(.exit.text+0x194f): undefined reference to `input_unregister_handler'
+ make[1]: *** [vmlinux] Error 1
+
+ Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
+ Acked-by: Ivo van Doorn <IvDoorn at gmail.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit e76328e4a8260707fbc29c99773fb5ba4627096c
+Author: Randy Dunlap <randy.dunlap at oracle.com>
+Date: Wed Jun 11 12:57:58 2008 -0700
+
+ rt2x00: INPUT build failure
+
+ Config symbols that select RFKILL need to depend on INPUT so that
+ undefined symbols are not used in the build.
+
+ This patch fixes the input_* symbols build errors.
+
+ (.text+0x174cdc): undefined reference to `input_unregister_device'
+ (.text+0x174d9f): undefined reference to `input_allocate_device'
+ (.text+0x174e2d): undefined reference to `input_register_device'
+ (.text+0x174e53): undefined reference to `input_free_device'
+ rt2x00rfkill.c:(.text+0x176dc4): undefined reference to `input_allocate_polled_device'
+ rt2x00rfkill.c:(.text+0x176e8b): undefined reference to `input_event'
+ rt2x00rfkill.c:(.text+0x176e9f): undefined reference to `input_event'
+ (.text+0x176eca): undefined reference to `input_unregister_polled_device'
+ (.text+0x176efc): undefined reference to `input_free_polled_device'
+ (.text+0x176f37): undefined reference to `input_free_polled_device'
+ (.text+0x176fd8): undefined reference to `input_register_polled_device'
+ (.text+0x1772c0): undefined reference to `led_classdev_resume'
+ (.text+0x1772d4): undefined reference to `led_classdev_resume'
+ (.text+0x1772e8): undefined reference to `led_classdev_resume'
+ (.text+0x17730a): undefined reference to `led_classdev_suspend'
+ (.text+0x17731e): undefined reference to `led_classdev_suspend'
+ (.text+0x17732f): undefined reference to `led_classdev_suspend'
+ rt2x00leds.c:(.text+0x177348): undefined reference to `led_classdev_unregister'
+ rt2x00leds.c:(.text+0x1773c0): undefined reference to `led_classdev_register'
+ rfkill-input.c:(.text+0x209e4c): undefined reference to `input_close_device'
+ rfkill-input.c:(.text+0x209e53): undefined reference to `input_unregister_handle'
+ rfkill-input.c:(.text+0x209ea1): undefined reference to `input_register_handle'
+ rfkill-input.c:(.text+0x209eae): undefined reference to `input_open_device'
+ rfkill-input.c:(.text+0x209ebb): undefined reference to `input_unregister_handle'
+ rfkill-input.c:(.init.text+0x17405): undefined reference to `input_register_handler'
+ rfkill-input.c:(.exit.text+0x194f): undefined reference to `input_unregister_handler'
+ make[1]: *** [vmlinux] Error 1
+
+ Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
+ Acked-by: Ivo van Doorn <IvDoorn at gmail.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 98a3b2fe435ae76170936c14f5c9e6a87548e3ef
+Author: Michael Buesch <mb at bu3sch.de>
+Date: Thu Jun 12 12:36:29 2008 +0200
+
+ b43: Fix noise calculation WARN_ON
+
+ This removes a WARN_ON that is responsible for the following koops:
+ http://www.kerneloops.org/searchweek.php?search=b43_generate_noise_sample
+
+ The comment in the patch describes why it's safe to simply remove
+ the check.
+
+ Signed-off-by: Michael Buesch <mb at bu3sch.de>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 028118a5f09a9c807e6b43e2231efdff9f224c74
+Author: Michael Buesch <mb at bu3sch.de>
+Date: Thu Jun 12 11:58:56 2008 +0200
+
+ b43: Fix possible NULL pointer dereference in DMA code
+
+ This fixes a possible NULL pointer dereference in an error path of the
+ DMA allocation error checking code. This is also necessary for a future
+ DMA API change that is on its way into the mainline kernel that adds
+ an additional dev parameter to dma_mapping_error().
+
+ This patch moves the whole struct b43_dmaring struct initialization
+ right before any DMA allocation operation.
+
+ Reported-by: Miles Lane <miles.lane at gmail.com>
+ Signed-off-by: Michael Buesch <mb at bu3sch.de>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 051c256f672efa356a4cda1841132dbc86541090
+Author: Gertjan van Wingerde <gwingerde at kpnplanet.nl>
+Date: Tue Jun 3 20:29:47 2008 +0200
+
+ rt2x00: Restrict DMA to 32-bit addresses.
+
+ None of the rt2x00 PCI devices support 64-bit DMA addresses (they all
+ only accept 32-bit buffer addresses). Hence it makes no sense to try to
+ enable 64-bit DMA addresses. Only try to enable 32-bit DMA addresses.
+
+ Signed-off-by: Gertjan van Wingerde <gwingerde at kpnplanet.nl>
+ Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit edfa78b2ba651782d70be6d1fef214e21a26d8cb
+Author: Ivo van Doorn <IvDoorn at gmail.com>
+Date: Tue Jun 3 20:29:50 2008 +0200
+
+ rt2x00: Don't kill guardian_urb when it wasn't created
+
+ This fixes a "BUG: unable to handle kernel paging request"
+ bug in rt73usb which was caused by killing the guardian_urb
+ while it had never been allocated for rt73usb.
+
[...4397 lines suppressed...]
@@ -11,7 +11,7 @@
#include <linux/types.h>
@@ -124633,8 +125053,8 @@
#endif /* TKIP_H */
diff -up linux-2.6.25.noarch/net/mac80211/tx.c.orig linux-2.6.25.noarch/net/mac80211/tx.c
---- linux-2.6.25.noarch/net/mac80211/tx.c.orig 2008-06-10 15:07:22.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/tx.c 2008-06-10 15:07:28.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/tx.c.orig 2008-06-13 17:47:28.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/tx.c 2008-06-13 17:47:53.000000000 -0400
@@ -25,11 +25,12 @@
#include <asm/unaligned.h>
@@ -126075,8 +126495,8 @@
return skb;
}
diff -up linux-2.6.25.noarch/net/mac80211/util.c.orig linux-2.6.25.noarch/net/mac80211/util.c
---- linux-2.6.25.noarch/net/mac80211/util.c.orig 2008-06-10 15:07:22.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/util.c 2008-06-10 15:07:28.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/util.c.orig 2008-06-13 17:47:28.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/util.c 2008-06-13 17:47:53.000000000 -0400
@@ -25,7 +25,8 @@
#include <net/rtnetlink.h>
@@ -126395,8 +126815,8 @@
-EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces);
+EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces_atomic);
diff -up linux-2.6.25.noarch/net/mac80211/wep.c.orig linux-2.6.25.noarch/net/mac80211/wep.c
---- linux-2.6.25.noarch/net/mac80211/wep.c.orig 2008-06-10 15:07:22.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-06-10 15:07:28.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wep.c.orig 2008-06-13 17:47:28.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-06-13 17:47:53.000000000 -0400
@@ -305,39 +305,39 @@ u8 * ieee80211_wep_is_weak_iv(struct sk_
return NULL;
}
@@ -126487,8 +126907,8 @@
+ return TX_CONTINUE;
}
diff -up linux-2.6.25.noarch/net/mac80211/wep.h.orig linux-2.6.25.noarch/net/mac80211/wep.h
---- linux-2.6.25.noarch/net/mac80211/wep.h.orig 2008-06-10 15:07:22.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-06-10 15:07:28.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wep.h.orig 2008-06-13 17:47:28.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-06-13 17:47:53.000000000 -0400
@@ -14,7 +14,7 @@
#include <linux/skbuff.h>
#include <linux/types.h>
@@ -126513,9 +126933,9 @@
#endif /* WEP_H */
diff -up /dev/null linux-2.6.25.noarch/net/mac80211/wext.c
---- /dev/null 2008-06-09 22:05:01.464004840 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-06-10 15:21:03.000000000 -0400
-@@ -0,0 +1,1163 @@
+--- /dev/null 2008-06-13 08:28:06.437004730 -0400
++++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-06-13 17:58:44.000000000 -0400
+@@ -0,0 +1,1164 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
+ * Copyright 2005-2006, Devicescape Software, Inc.
@@ -127014,7 +127434,8 @@
+ sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+ if (sdata->vif.type == IEEE80211_IF_TYPE_STA ||
+ sdata->vif.type == IEEE80211_IF_TYPE_IBSS) {
-+ if (sdata->u.sta.state == IEEE80211_ASSOCIATED) {
++ if (sdata->u.sta.state == IEEE80211_ASSOCIATED ||
++ sdata->u.sta.state == IEEE80211_IBSS_JOINED) {
+ ap_addr->sa_family = ARPHRD_ETHER;
+ memcpy(&ap_addr->sa_data, sdata->u.sta.bssid, ETH_ALEN);
+ return 0;
@@ -127680,8 +128101,8 @@
+ .get_wireless_stats = ieee80211_get_wireless_stats,
+};
diff -up linux-2.6.25.noarch/net/mac80211/wme.c.orig linux-2.6.25.noarch/net/mac80211/wme.c
---- linux-2.6.25.noarch/net/mac80211/wme.c.orig 2008-06-10 15:07:22.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-06-10 15:07:28.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wme.c.orig 2008-06-13 17:47:28.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-06-13 17:58:44.000000000 -0400
@@ -19,10 +19,13 @@
#include "wme.h"
@@ -127838,7 +128259,7 @@
+#ifdef CONFIG_MAC80211_HT_DEBUG
+ if (net_ratelimit())
+ printk(KERN_DEBUG "allocated aggregation queue"
-+ " %d tid %d addr %s pool=0x%lX",
++ " %d tid %d addr %s pool=0x%lX\n",
+ i, tid, print_mac(mac, sta->addr),
+ q->qdisc_pool[0]);
+#endif /* CONFIG_MAC80211_HT_DEBUG */
@@ -127891,8 +128312,8 @@
+ }
+}
diff -up linux-2.6.25.noarch/net/mac80211/wme.h.orig linux-2.6.25.noarch/net/mac80211/wme.h
---- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-06-10 15:07:22.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-06-10 15:07:28.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-06-13 17:47:28.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-06-13 17:47:53.000000000 -0400
@@ -24,6 +24,8 @@
#define QOS_CONTROL_TAG1D_MASK 0x07
@@ -127938,8 +128359,8 @@
{
return 0;
diff -up linux-2.6.25.noarch/net/mac80211/wpa.c.orig linux-2.6.25.noarch/net/mac80211/wpa.c
---- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-06-10 15:07:22.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-06-10 15:07:28.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-06-13 17:47:28.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-06-13 17:47:53.000000000 -0400
@@ -70,8 +70,8 @@ static int ieee80211_get_hdr_info(const
}
@@ -128319,8 +128740,8 @@
+ return RX_CONTINUE;
}
diff -up linux-2.6.25.noarch/net/mac80211/wpa.h.orig linux-2.6.25.noarch/net/mac80211/wpa.h
---- linux-2.6.25.noarch/net/mac80211/wpa.h.orig 2008-06-10 15:07:22.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wpa.h 2008-06-10 15:07:28.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wpa.h.orig 2008-06-13 17:47:28.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wpa.h 2008-06-13 17:47:53.000000000 -0400
@@ -13,19 +13,19 @@
#include <linux/types.h>
#include "ieee80211_i.h"
@@ -128354,8 +128775,8 @@
#endif /* WPA_H */
diff -up linux-2.6.25.noarch/net/wireless/core.c.orig linux-2.6.25.noarch/net/wireless/core.c
---- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-06-10 15:07:22.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/core.c 2008-06-10 15:07:28.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-06-13 17:47:28.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/core.c 2008-06-13 17:47:53.000000000 -0400
@@ -232,6 +232,47 @@ int wiphy_register(struct wiphy *wiphy)
{
struct cfg80211_registered_device *drv = wiphy_to_dev(wiphy);
@@ -128405,8 +128826,8 @@
mutex_lock(&cfg80211_drv_mutex);
diff -up linux-2.6.25.noarch/net/wireless/core.h.orig linux-2.6.25.noarch/net/wireless/core.h
---- linux-2.6.25.noarch/net/wireless/core.h.orig 2008-06-10 15:07:22.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/core.h 2008-06-10 15:07:28.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/core.h.orig 2008-06-13 17:47:28.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/core.h 2008-06-13 17:47:53.000000000 -0400
@@ -78,4 +78,7 @@ extern void cfg80211_dev_free(struct cfg
extern int cfg80211_dev_rename(struct cfg80211_registered_device *drv,
char *newname);
@@ -128416,8 +128837,8 @@
+
#endif /* __NET_WIRELESS_CORE_H */
diff -up linux-2.6.25.noarch/net/wireless/Makefile.orig linux-2.6.25.noarch/net/wireless/Makefile
---- linux-2.6.25.noarch/net/wireless/Makefile.orig 2008-06-10 15:07:22.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/Makefile 2008-06-10 15:07:28.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/Makefile.orig 2008-06-13 17:47:28.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/Makefile 2008-06-13 17:47:53.000000000 -0400
@@ -1,5 +1,5 @@
obj-$(CONFIG_WIRELESS_EXT) += wext.o
obj-$(CONFIG_CFG80211) += cfg80211.o
@@ -128426,8 +128847,8 @@
+cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o
cfg80211-$(CONFIG_NL80211) += nl80211.o
diff -up linux-2.6.25.noarch/net/wireless/nl80211.c.orig linux-2.6.25.noarch/net/wireless/nl80211.c
---- linux-2.6.25.noarch/net/wireless/nl80211.c.orig 2008-06-10 15:07:22.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/nl80211.c 2008-06-10 15:07:28.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/nl80211.c.orig 2008-06-13 17:47:28.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/nl80211.c 2008-06-13 17:47:53.000000000 -0400
@@ -81,7 +81,12 @@ static struct nla_policy nl80211_policy[
[NL80211_ATTR_STA_LISTEN_INTERVAL] = { .type = NLA_U16 },
[NL80211_ATTR_STA_SUPPORTED_RATES] = { .type = NLA_BINARY,
@@ -129118,8 +129539,8 @@
/* multicast groups */
diff -up /dev/null linux-2.6.25.noarch/net/wireless/reg.c
---- /dev/null 2008-06-09 22:05:01.464004840 -0400
-+++ linux-2.6.25.noarch/net/wireless/reg.c 2008-06-10 15:07:28.000000000 -0400
+--- /dev/null 2008-06-13 08:28:06.437004730 -0400
++++ linux-2.6.25.noarch/net/wireless/reg.c 2008-06-13 17:47:53.000000000 -0400
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -129284,8 +129705,8 @@
+ handle_band(wiphy->bands[band], rd);
+}
diff -up /dev/null linux-2.6.25.noarch/net/wireless/util.c
---- /dev/null 2008-06-09 22:05:01.464004840 -0400
-+++ linux-2.6.25.noarch/net/wireless/util.c 2008-06-10 15:07:28.000000000 -0400
+--- /dev/null 2008-06-13 08:28:06.437004730 -0400
++++ linux-2.6.25.noarch/net/wireless/util.c 2008-06-13 17:47:53.000000000 -0400
@@ -0,0 +1,121 @@
+/*
+ * Wireless utility functions
@@ -129409,8 +129830,8 @@
+ set_mandatory_flags_band(wiphy->bands[band], band);
+}
diff -up linux-2.6.25.noarch/net/wireless/wext.c.orig linux-2.6.25.noarch/net/wireless/wext.c
---- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-06-10 15:07:22.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/wext.c 2008-06-10 15:07:28.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-06-13 17:47:28.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/wext.c 2008-06-13 17:47:53.000000000 -0400
@@ -1157,7 +1157,7 @@ static void rtmsg_iwinfo(struct net_devi
struct sk_buff *skb;
int err;
- Previous message (by thread): rpms/kernel/devel kernel.spec, 1.691, 1.692 linux-2.6-wireless-pending.patch, 1.52, 1.53 linux-2.6-wireless.patch, 1.40, 1.41
- Next message (by thread): rpms/kernel/F-8 kernel.spec, 1.467, 1.468 linux-2.6-wireless-pending.patch, 1.47, 1.48 linux-2.6-wireless.patch, 1.41, 1.42
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list