rpms/kernel/F-9 kernel.spec, 1.703, 1.704 linux-2.6-wireless-fixups.patch, 1.7, 1.8 linux-2.6-wireless-pending.patch, 1.55, 1.56 linux-2.6-wireless.patch, 1.43, 1.44
John W. Linville (linville)
fedora-extras-commits at redhat.com
Fri Jul 4 20:22:36 UTC 2008
Author: linville
Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29838
Modified Files:
kernel.spec linux-2.6-wireless-fixups.patch
linux-2.6-wireless-pending.patch linux-2.6-wireless.patch
Log Message:
Upstream wireless fixes from 2008-07-02 ; Apply Stefan Beckers fix for bad hunk of wireless build fixups for 2.6.25
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.703
retrieving revision 1.704
diff -u -r1.703 -r1.704
--- kernel.spec 4 Jul 2008 20:01:01 -0000 1.703
+++ kernel.spec 4 Jul 2008 20:21:44 -0000 1.704
@@ -1864,6 +1864,12 @@
%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 Jul 04 2008 John W. Linville <linville at redhat.com> 2.6.25.9-85
+- Upstream wireless fixes from 2008-07-02
+ (http://marc.info/?l=linux-netdev&m=121503163124089&w=2)
+- Apply Stefan Becker's fix for bad hunk of wireless build fixups for 2.6.25
+ (https://bugzilla.redhat.com/show_bug.cgi?id=453390#c36)
+
* Fri Jul 04 2008 Dave Jones <davej at redhat.com>
- Better fix for the Nikon D80 usb-storage quirk.
linux-2.6-wireless-fixups.patch:
Index: linux-2.6-wireless-fixups.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-wireless-fixups.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-wireless-fixups.patch 1 Jul 2008 19:35:04 -0000 1.7
+++ linux-2.6-wireless-fixups.patch 4 Jul 2008 20:21:44 -0000 1.8
@@ -936,8 +936,8 @@
- for (i = 0; i < 6; i++)
- put_unaligned_le16(ppk[i], rc4key + 2 * i);
+ for (i = 0; i < 6; i++) {
-+ rc4key[4 + 2 * i] = Lo8(ppk[i]);
-+ rc4key[5 + 2 * i] = Hi8(ppk[i]);
++ rc4key[0 + 2 * i] = Lo8(ppk[i]);
++ rc4key[1 + 2 * i] = Hi8(ppk[i]);
+ }
}
linux-2.6-wireless-pending.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.55 -r 1.56 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.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- linux-2.6-wireless-pending.patch 2 Jul 2008 22:04:18 -0000 1.55
+++ linux-2.6-wireless-pending.patch 4 Jul 2008 20:21:44 -0000 1.56
@@ -97,18 +97,6 @@
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit a6ecfe5a9bd32c9426f9af801e62f21da132a2cc
-Author: Zhu Yi <yi.zhu at intel.com>
-Date: Mon Jun 30 17:23:29 2008 +0800
-
- iwlwifi: drop skb silently for Tx request in monitor mode
-
- This patch fixes the problem to keep mac80211 resubmitting SKBs
- when Tx request cannot be met in monitor mode.
-
- Signed-off-by: Zhu Yi <yi.zhu at intel.com>
- Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
commit 6fe878497b04b9c428842ab9c89c0e2d712860ad
Author: Rick Farrington <rickdic at hotmail.com>
Date: Mon Jun 30 17:23:28 2008 +0800
@@ -132,23 +120,6 @@
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit 32c932be01d96abe84340b0831db949ca4713292
-Author: Rick Farrington <rickdic at hotmail.com>
-Date: Mon Jun 30 17:23:27 2008 +0800
-
- iwlwifi: fix incorrect 5GHz rates reported in monitor mode
-
- This patch fixes the rates reported in monitor mode operation
- (Wireshark) for iwlwifi.
-
- Previously, packets with rates of 6M..24M would be reported
- incorrectly and packets with rates of 36M..54M would not passed
- up the stack.
-
- Signed-off-by: Rick Farrington <rickdic at hotmail.com>
- Signed-off-by: Zhu Yi <yi.zhu at intel.com>
- Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
commit 0a078ffa011209c307880da10917ef205b4b11f4
Author: Tomas Winkler <tomas.winkler at intel.com>
Date: Mon Jun 30 17:23:26 2008 +0800
@@ -6681,8 +6652,8 @@
Signed-off-by: John W. Linville <linville at tuxdriver.com>
diff -up /dev/null linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/hostapd.conf
---- /dev/null 2008-07-02 08:48:43.373004702 -0400
-+++ linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/hostapd.conf 2008-07-02 17:33:29.000000000 -0400
+--- /dev/null 2008-07-03 09:55:47.025003120 -0400
++++ linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/hostapd.conf 2008-07-03 16:26:36.000000000 -0400
@@ -0,0 +1,11 @@
+interface=wlan0
+driver=nl80211
@@ -6696,8 +6667,8 @@
+wpa_pairwise=CCMP
+wpa_passphrase=12345678
diff -up /dev/null linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/README
---- /dev/null 2008-07-02 08:48:43.373004702 -0400
-+++ linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/README 2008-07-02 17:33:29.000000000 -0400
+--- /dev/null 2008-07-03 09:55:47.025003120 -0400
++++ linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/README 2008-07-03 16:26:36.000000000 -0400
@@ -0,0 +1,67 @@
+mac80211_hwsim - software simulator of 802.11 radio(s) for mac80211
+Copyright (c) 2008, Jouni Malinen <j at w1.fi>
@@ -6767,8 +6738,8 @@
+# Run wpa_supplicant (station) for wlan1
+wpa_supplicant -Dwext -iwlan1 -c wpa_supplicant.conf
diff -up /dev/null linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/wpa_supplicant.conf
---- /dev/null 2008-07-02 08:48:43.373004702 -0400
-+++ linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/wpa_supplicant.conf 2008-07-02 17:33:29.000000000 -0400
+--- /dev/null 2008-07-03 09:55:47.025003120 -0400
++++ linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/wpa_supplicant.conf 2008-07-03 16:26:36.000000000 -0400
@@ -0,0 +1,10 @@
+ctrl_interface=/var/run/wpa_supplicant
+
@@ -6781,8 +6752,8 @@
+ group=CCMP
+}
diff -up linux-2.6.25.noarch/Documentation/rfkill.txt.orig linux-2.6.25.noarch/Documentation/rfkill.txt
---- linux-2.6.25.noarch/Documentation/rfkill.txt.orig 2008-07-02 17:33:15.000000000 -0400
-+++ linux-2.6.25.noarch/Documentation/rfkill.txt 2008-07-02 17:33:29.000000000 -0400
+--- linux-2.6.25.noarch/Documentation/rfkill.txt.orig 2008-07-03 16:26:08.000000000 -0400
++++ linux-2.6.25.noarch/Documentation/rfkill.txt 2008-07-03 16:26:36.000000000 -0400
@@ -1,89 +1,528 @@
rfkill - RF switch subsystem support
====================================
@@ -7371,8 +7342,8 @@
+available through sysfs in a generic way at this time, and it is not available
+through the rfkill class AT ALL.
diff -up linux-2.6.25.noarch/drivers/net/b44.c.orig linux-2.6.25.noarch/drivers/net/b44.c
---- linux-2.6.25.noarch/drivers/net/b44.c.orig 2008-07-02 17:33:15.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/b44.c 2008-07-02 17:33:29.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/b44.c.orig 2008-07-03 16:26:08.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/b44.c 2008-07-03 16:26:36.000000000 -0400
@@ -148,9 +148,9 @@ static inline void b44_sync_dma_desc_for
unsigned long offset,
enum dma_data_direction dir)
@@ -7660,8 +7631,8 @@
kfree(tx_ring);
goto out_err;
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-07-02 17:33:15.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/Kconfig 2008-07-02 17:33:29.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/Kconfig.orig 2008-07-03 16:26:08.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/Kconfig 2008-07-03 16:26:36.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.
@@ -7683,8 +7654,8 @@
tristate "Gianfar Ethernet"
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-07-02 17:33:15.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/ps3_gelic_net.c 2008-07-02 17:33:29.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/ps3_gelic_net.c.orig 2008-07-03 16:26:08.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/ps3_gelic_net.c 2008-07-03 16:26:36.000000000 -0400
@@ -110,7 +110,7 @@ static void gelic_card_get_ether_port_st
void gelic_card_up(struct gelic_card *card)
{
@@ -7731,8 +7702,8 @@
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-07-02 17:33:15.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/ps3_gelic_net.h 2008-07-02 17:33:29.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/ps3_gelic_net.h.orig 2008-07-03 16:26:08.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/ps3_gelic_net.h 2008-07-03 16:26:36.000000000 -0400
@@ -278,7 +278,7 @@ struct gelic_card {
wait_queue_head_t waitq;
@@ -7743,8 +7714,8 @@
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-07-02 17:33:15.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.c 2008-07-02 17:33:29.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.c.orig 2008-07-03 16:26:08.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.c 2008-07-03 16:26:36.000000000 -0400
@@ -45,7 +45,8 @@
#include "ps3_gelic_wireless.h"
@@ -8410,8 +8381,8 @@
destroy_workqueue(wl->eurus_cmd_queue);
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-07-02 17:33:15.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.h 2008-07-02 17:33:29.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.h.orig 2008-07-03 16:26:08.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.h 2008-07-03 16:26:36.000000000 -0400
@@ -241,7 +241,7 @@ enum gelic_wl_assoc_state {
#define GELIC_WEP_KEYS 4
struct gelic_wl_info {
@@ -8441,8 +8412,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-07-02 17:33:15.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-07-02 17:33:29.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig 2008-07-03 16:26:08.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-07-03 16:26:36.000000000 -0400
@@ -306,11 +306,10 @@ static int adm8211_get_tx_stats(struct i
struct ieee80211_tx_queue_stats *stats)
{
@@ -8605,8 +8576,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-07-02 17:33:15.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-07-02 17:33:29.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig 2008-07-03 16:26:08.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-07-03 16:26:36.000000000 -0400
@@ -443,7 +443,6 @@ struct adm8211_rx_ring_info {
struct adm8211_tx_ring_info {
struct sk_buff *skb;
@@ -8616,8 +8587,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-07-02 17:33:15.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-07-02 17:33:29.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-07-03 16:26:08.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-07-03 16:26:36.000000000 -0400
@@ -85,10 +85,10 @@ static struct pci_driver airo_driver = {
/* Include Wireless Extension definition and check version - Jean II */
@@ -9063,8 +9034,8 @@
&net->bss);
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-07-02 17:33:15.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/arlan.h 2008-07-02 17:33:29.000000000 -0400
[...3657 lines suppressed...]
dev_kfree_skb_any(skb);
@@ -73754,8 +73736,8 @@
if (skb_queue_empty(&sta->ps_tx_buf))
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-07-02 17:33:16.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/sta_info.h 2008-07-02 17:33:30.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/sta_info.h.orig 2008-07-03 16:26:09.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/sta_info.h 2008-07-03 16:26: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.
@@ -73936,8 +73918,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-07-02 17:33:16.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/tkip.c 2008-07-02 17:33:30.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/tkip.c.orig 2008-07-03 16:26:09.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/tkip.c 2008-07-03 16:26: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.
@@ -74394,8 +74376,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-07-02 17:33:16.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/tkip.h 2008-07-02 17:33:30.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/tkip.h.orig 2008-07-03 16:26:09.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/tkip.h 2008-07-03 16:26:37.000000000 -0400
@@ -13,12 +13,8 @@
#include <linux/crypto.h>
#include "key.h"
@@ -74412,8 +74394,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-07-02 17:33:16.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/tx.c 2008-07-02 17:33:46.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/tx.c.orig 2008-07-03 16:26:09.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/tx.c 2008-07-03 16:27:32.000000000 -0400
@@ -52,9 +52,8 @@ static inline void ieee80211_include_seq
static void ieee80211_dump_frame(const char *ifname, const char *title,
const struct sk_buff *skb)
@@ -76166,8 +76148,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-07-02 17:33:16.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/util.c 2008-07-02 17:33:30.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/util.c.orig 2008-07-03 16:26:09.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/util.c 2008-07-03 16:26:37.000000000 -0400
@@ -45,38 +45,37 @@ const unsigned char bridge_tunnel_header
u8 *ieee80211_get_bssid(struct ieee80211_hdr *hdr, size_t len,
enum ieee80211_if_types type)
@@ -76419,8 +76401,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-07-02 17:33:16.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-07-02 17:33:46.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wep.c.orig 2008-07-03 16:26:09.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-07-03 16:26:37.000000000 -0400
@@ -84,24 +84,17 @@ static u8 *ieee80211_wep_add_iv(struct i
struct sk_buff *skb,
struct ieee80211_key *key)
@@ -76571,8 +76553,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-07-02 17:33:16.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-07-02 17:33:30.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wep.h.orig 2008-07-03 16:26:09.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-07-03 16:26: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,
@@ -76583,8 +76565,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-07-02 17:33:16.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-07-02 17:33:30.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wext.c.orig 2008-07-03 16:26:09.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-07-03 16:26:37.000000000 -0400
@@ -142,7 +142,39 @@ static int ieee80211_ioctl_giwname(struc
struct iw_request_info *info,
char *name, char *extra)
@@ -76709,8 +76691,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-07-02 17:33:16.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-07-02 17:33:46.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wme.c.orig 2008-07-03 16:26:09.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-07-03 16:26:37.000000000 -0400
@@ -19,16 +19,22 @@
#include "wme.h"
@@ -77123,8 +77105,8 @@
skb = qdisc->dequeue(qdisc);
root_qd->q.qlen--;
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-07-02 17:33:16.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-07-02 17:33:30.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-07-03 16:26:09.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-07-03 16:26:37.000000000 -0400
@@ -31,7 +31,7 @@ static inline int WLAN_FC_IS_QOS_DATA(u1
return (fc & 0x8C) == 0x88;
}
@@ -77135,8 +77117,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-07-02 17:33:16.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-07-02 17:33:46.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-07-03 16:26:09.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-07-03 16:26:37.000000000 -0400
@@ -24,46 +24,22 @@ static int ieee80211_get_hdr_info(const
{
struct ieee80211_hdr *hdr;
@@ -77575,8 +77557,8 @@
}
}
diff -up linux-2.6.25.noarch/net/rfkill/rfkill.c.orig linux-2.6.25.noarch/net/rfkill/rfkill.c
---- linux-2.6.25.noarch/net/rfkill/rfkill.c.orig 2008-07-02 17:33:16.000000000 -0400
-+++ linux-2.6.25.noarch/net/rfkill/rfkill.c 2008-07-02 17:33:30.000000000 -0400
+--- linux-2.6.25.noarch/net/rfkill/rfkill.c.orig 2008-07-03 16:26:09.000000000 -0400
++++ linux-2.6.25.noarch/net/rfkill/rfkill.c 2008-07-03 16:26:37.000000000 -0400
@@ -39,8 +39,56 @@ MODULE_LICENSE("GPL");
static LIST_HEAD(rfkill_list); /* list of registered rf switches */
static DEFINE_MUTEX(rfkill_mutex);
@@ -78038,8 +78020,8 @@
}
diff -up linux-2.6.25.noarch/net/rfkill/rfkill-input.c.orig linux-2.6.25.noarch/net/rfkill/rfkill-input.c
---- linux-2.6.25.noarch/net/rfkill/rfkill-input.c.orig 2008-07-02 17:33:16.000000000 -0400
-+++ linux-2.6.25.noarch/net/rfkill/rfkill-input.c 2008-07-02 17:33:30.000000000 -0400
+--- linux-2.6.25.noarch/net/rfkill/rfkill-input.c.orig 2008-07-03 16:26:09.000000000 -0400
++++ linux-2.6.25.noarch/net/rfkill/rfkill-input.c 2008-07-03 16:26:37.000000000 -0400
@@ -30,39 +30,62 @@ struct rfkill_task {
spinlock_t lock; /* for accessing last and desired state */
unsigned long last; /* last schedule */
@@ -78197,8 +78179,8 @@
};
diff -up linux-2.6.25.noarch/net/rfkill/rfkill-input.h.orig linux-2.6.25.noarch/net/rfkill/rfkill-input.h
---- linux-2.6.25.noarch/net/rfkill/rfkill-input.h.orig 2008-07-02 17:33:16.000000000 -0400
-+++ linux-2.6.25.noarch/net/rfkill/rfkill-input.h 2008-07-02 17:33:30.000000000 -0400
+--- linux-2.6.25.noarch/net/rfkill/rfkill-input.h.orig 2008-07-03 16:26:09.000000000 -0400
++++ linux-2.6.25.noarch/net/rfkill/rfkill-input.h 2008-07-03 16:26:37.000000000 -0400
@@ -12,5 +12,6 @@
#define __RFKILL_INPUT_H
@@ -78207,8 +78189,8 @@
#endif /* __RFKILL_INPUT_H */
diff -up linux-2.6.25.noarch/net/socket.c.orig linux-2.6.25.noarch/net/socket.c
---- linux-2.6.25.noarch/net/socket.c.orig 2008-07-02 17:33:16.000000000 -0400
-+++ linux-2.6.25.noarch/net/socket.c 2008-07-02 17:33:30.000000000 -0400
+--- linux-2.6.25.noarch/net/socket.c.orig 2008-07-03 16:26:09.000000000 -0400
++++ linux-2.6.25.noarch/net/socket.c 2008-07-03 16:26:37.000000000 -0400
@@ -90,6 +90,7 @@
#include <asm/unistd.h>
@@ -78238,8 +78220,8 @@
}
#endif
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-07-02 17:33:16.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-02 17:33:30.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-03 16:26:09.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-03 16:26: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)
@@ -78303,8 +78285,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-07-02 17:33:16.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-07-02 17:33:30.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-07-03 16:26:09.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-07-03 16:26:37.000000000 -0400
@@ -59,23 +59,21 @@ int ieee80211_radiotap_iterator_init(
return -EINVAL;
@@ -78346,8 +78328,8 @@
} else
/* no more bitmaps: end */
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-07-02 17:33:16.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-02 17:33:30.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-03 16:26:09.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-03 16:26:37.000000000 -0400
@@ -500,7 +500,7 @@ static int call_commit_handler(struct ne
/*
* Calculate size of private arguments
linux-2.6-wireless.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.43 -r 1.44 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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- linux-2.6-wireless.patch 1 Jul 2008 18:42:14 -0000 1.43
+++ linux-2.6-wireless.patch 4 Jul 2008 20:21:44 -0000 1.44
@@ -1,3 +1,46 @@
+commit 7b58ccfe32f40eca8c8ca29aa723a5d0e814f0c9
+Author: andrey at cozybit.com <andrey at cozybit.com>
+Date: Tue Jul 1 11:43:53 2008 -0700
+
+ libertas: support USB persistence on suspend/resume (resend)
+
+ Handle .reset_resume() so that libertas can survive suspend/resume without
+ reloading the firmware.
+
+ Signed-off-by: Andrey Yurovsky <andrey at cozybit.com>
+ Acked-by: Deepak Saxena <dsaxena at laptop.org>
+ Acked-by: Dan Williams <dcbw at redhat.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 6afe6828b19b4567768264831d101026cb5510ff
+Author: Zhu Yi <yi.zhu at intel.com>
+Date: Tue Jul 1 09:20:34 2008 +0800
+
+ iwlwifi: drop skb silently for Tx request in monitor mode
+
+ This patch fixes the problem to keep mac80211 resubmitting SKBs
+ when Tx request cannot be met in monitor mode.
+
+ Signed-off-by: Zhu Yi <yi.zhu at intel.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit ec04fd60fd74a9db9c63fe11d519be3642cabfdd
+Author: Rick Farrington <rickdic at hotmail.com>
+Date: Tue Jul 1 09:20:33 2008 +0800
+
+ iwlwifi: fix incorrect 5GHz rates reported in monitor mode
+
+ This patch fixes the rates reported in monitor mode operation
+ (Wireshark) for iwlwifi.
+
+ Previously, packets with rates of 6M..24M would be reported
+ incorrectly and packets with rates of 36M..54M would not passed
+ up the stack.
+
+ Signed-off-by: Rick Farrington <rickdic at hotmail.com>
+ Signed-off-by: Zhu Yi <yi.zhu at intel.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
commit 23976efedd5ecb420b87455787c537eb4aed1981
Author: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
Date: Sat Jun 28 02:50:13 2008 +0300
@@ -9216,8 +9259,8 @@
Signed-off-by: John W. Linville <linville at tuxdriver.com>
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-07-01 13:34:26.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-07-01 13:34:56.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig 2008-07-03 15:41:01.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-07-03 15:41:19.000000000 -0400
@@ -48,6 +48,32 @@ static struct pci_device_id adm8211_pci_
{ 0 }
};
@@ -9415,8 +9458,8 @@
err = ieee80211_register_hw(dev);
if (err) {
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-07-01 13:34:26.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-07-01 13:34:56.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig 2008-07-03 15:41:01.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-07-03 15:41:19.000000000 -0400
@@ -534,61 +534,6 @@ struct adm8211_eeprom {
u8 cis_data[0]; /* 0x80, 384 bytes */
} __attribute__ ((packed));
@@ -9504,8 +9547,8 @@
{1, 11}, /* FCC */
{1, 11}, /* IC */
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-07-01 13:34:26.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-07-01 13:34:56.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-07-03 15:41:01.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-07-03 15:41:19.000000000 -0400
@@ -2668,6 +2668,7 @@ static struct net_device *init_wifidev(s
dev->irq = ethdev->irq;
dev->base_addr = ethdev->base_addr;
@@ -9760,8 +9803,8 @@
/*
diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h
---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h.orig 2008-07-01 13:34:26.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h 2008-07-01 13:34:56.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h.orig 2008-07-03 15:41:01.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h 2008-07-03 15:41:19.000000000 -0400
@@ -30,7 +30,6 @@
#include <net/mac80211.h>
@@ -10111,8 +10154,8 @@
extern int ath5k_hw_get_capability(struct ath5k_hw *ah, enum ath5k_capability_type cap_type, u32 capability, u32 *result);
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-07-01 13:34:26.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-07-01 13:34:56.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-07-03 15:41:01.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-07-03 15:41:19.000000000 -0400
@@ -58,10 +58,6 @@
#include "reg.h"
#include "debug.h"
@@ -11166,8 +11209,8 @@
memcpy(stats, &sc->ll_stats, sizeof(sc->ll_stats));
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-07-01 13:34:26.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h 2008-07-01 13:34:56.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-07-03 15:41:01.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h 2008-07-03 15:41:19.000000000 -0400
@@ -83,7 +83,7 @@ struct ath5k_txq {
#if CHAN_DEBUG
#define ATH_CHAN_MAX (26+26+26+200+200)
@@ -11213,8 +11256,8 @@
#define ath5k_hw_hasbssidmask(_ah) \
diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c
---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c.orig 2008-07-01 13:34:26.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c 2008-07-01 13:34:56.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c.orig 2008-07-03 15:41:01.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.c 2008-07-03 15:41:19.000000000 -0400
@@ -65,7 +65,7 @@ static unsigned int ath5k_debug;
module_param_named(debug, ath5k_debug, uint, 0);
@@ -11389,8 +11432,8 @@
-#endif /* if ATH5K_DEBUG */
+#endif /* ifdef CONFIG_ATH5K_DEBUG */
diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h
---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h.orig 2008-07-01 13:34:26.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h 2008-07-01 13:34:56.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h.orig 2008-07-03 15:41:01.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/debug.h 2008-07-03 15:41:19.000000000 -0400
@@ -61,11 +61,6 @@
#ifndef _ATH5K_DEBUG_H
#define _ATH5K_DEBUG_H
@@ -11475,8 +11518,8 @@
#endif /* ifndef _ATH5K_DEBUG_H */
diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c
---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c.orig 2008-07-01 13:34:26.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c 2008-07-01 13:34:56.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c.orig 2008-07-03 15:41:01.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.c 2008-07-03 15:41:19.000000000 -0400
@@ -1,4 +1,4 @@
- /*
+/*
@@ -13071,8 +13114,8 @@
/****************\
diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h
---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h.orig 2008-07-01 13:34:26.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h 2008-07-01 13:34:56.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h.orig 2008-07-03 15:41:01.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/hw.h 2008-07-03 15:41:19.000000000 -0400
@@ -173,7 +173,10 @@ struct ath5k_eeprom_info {
* (rX: reserved fields possibily used by future versions of the ar5k chipset)
*/
@@ -13274,8 +13317,8 @@
*/
diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c
---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c.orig 2008-07-01 13:34:26.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c 2008-07-01 13:34:57.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c.orig 2008-07-03 15:41:01.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/initvals.c 2008-07-03 15:41:19.000000000 -0400
@@ -678,8 +678,8 @@ static const struct ath5k_ini ar5212_ini
{ AR5K_PHY(644), 0x00806333 },
{ AR5K_PHY(645), 0x00106c10 },
@@ -13798,8 +13841,8 @@
}
diff -up /dev/null linux-2.6.25.noarch/drivers/net/wireless/ath5k/Kconfig
---- /dev/null 2008-07-01 08:25:54.335004873 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Kconfig 2008-07-01 13:34:57.000000000 -0400
+--- /dev/null 2008-07-03 09:55:47.025003120 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Kconfig 2008-07-03 15:41:19.000000000 -0400
@@ -0,0 +1,37 @@
+config ATH5K
+ tristate "Atheros 5xxx wireless cards support"
@@ -13839,8 +13882,8 @@
+ modprobe ath5k debug=0x00000400
+
diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile
---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile.orig 2008-07-01 13:34:26.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile 2008-07-01 13:34:57.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile.orig 2008-07-03 15:41:01.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/Makefile 2008-07-03 15:41:19.000000000 -0400
@@ -1,2 +1,6 @@
-ath5k-objs = base.o hw.o regdom.o initvals.o phy.o debug.o
-obj-$(CONFIG_ATH5K) += ath5k.o
@@ -13851,8 +13894,8 @@
+ath5k-$(CONFIG_ATH5K_DEBUG) += debug.o
[...4826 lines suppressed...]
#include <linux/list.h>
#include <linux/types.h>
@@ -125625,8 +125697,8 @@
#endif /* STA_INFO_H */
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-07-01 13:34:27.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/tkip.c 2008-07-01 13:34:58.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/tkip.c.orig 2008-07-03 15:41:02.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/tkip.c 2008-07-03 15:41:19.000000000 -0400
@@ -12,7 +12,7 @@
#include <linux/netdevice.h>
@@ -125724,8 +125796,8 @@
tkip_mixing_phase2(key->u.tkip.p1k_rx[queue],
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-07-01 13:34:27.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/tkip.h 2008-07-01 13:34:58.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/tkip.h.orig 2008-07-03 15:41:02.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/tkip.h 2008-07-03 15:41:19.000000000 -0400
@@ -11,7 +11,7 @@
#include <linux/types.h>
@@ -125745,8 +125817,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-07-01 13:34:27.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/tx.c 2008-07-01 13:34:58.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/tx.c.orig 2008-07-03 15:41:02.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/tx.c 2008-07-03 15:41:19.000000000 -0400
@@ -25,11 +25,12 @@
#include <asm/unaligned.h>
@@ -127201,8 +127273,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-07-01 13:34:27.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/util.c 2008-07-01 13:34:58.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/util.c.orig 2008-07-03 15:41:02.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/util.c 2008-07-03 15:41:19.000000000 -0400
@@ -25,7 +25,8 @@
#include <net/rtnetlink.h>
@@ -127521,8 +127593,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-07-01 13:34:27.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-07-01 13:34:58.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wep.c.orig 2008-07-03 15:41:02.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-07-03 15:41:19.000000000 -0400
@@ -305,39 +305,39 @@ u8 * ieee80211_wep_is_weak_iv(struct sk_
return NULL;
}
@@ -127613,8 +127685,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-07-01 13:34:27.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-07-01 13:34:58.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wep.h.orig 2008-07-03 15:41:02.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-07-03 15:41:19.000000000 -0400
@@ -14,7 +14,7 @@
#include <linux/skbuff.h>
#include <linux/types.h>
@@ -127639,8 +127711,8 @@
#endif /* WEP_H */
diff -up /dev/null linux-2.6.25.noarch/net/mac80211/wext.c
---- /dev/null 2008-07-01 08:25:54.335004873 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-07-01 13:35:13.000000000 -0400
+--- /dev/null 2008-07-03 09:55:47.025003120 -0400
++++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-07-03 15:41:19.000000000 -0400
@@ -0,0 +1,1171 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -128814,8 +128886,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-07-01 13:34:27.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-07-01 13:34:58.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wme.c.orig 2008-07-03 15:41:02.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-07-03 15:41:19.000000000 -0400
@@ -19,10 +19,13 @@
#include "wme.h"
@@ -129025,8 +129097,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-07-01 13:34:27.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-07-01 13:34:58.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-07-03 15:41:02.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-07-03 15:41:19.000000000 -0400
@@ -24,6 +24,8 @@
#define QOS_CONTROL_TAG1D_MASK 0x07
@@ -129072,8 +129144,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-07-01 13:34:27.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-07-01 13:34:58.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-07-03 15:41:02.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-07-03 15:41:19.000000000 -0400
@@ -70,8 +70,8 @@ static int ieee80211_get_hdr_info(const
}
@@ -129453,8 +129525,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-07-01 13:34:27.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wpa.h 2008-07-01 13:34:58.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wpa.h.orig 2008-07-03 15:41:02.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wpa.h 2008-07-03 15:41:19.000000000 -0400
@@ -13,19 +13,19 @@
#include <linux/types.h>
#include "ieee80211_i.h"
@@ -129488,8 +129560,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-07-01 13:34:27.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-01 13:34:58.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-07-03 15:41:02.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-03 15:41:19.000000000 -0400
@@ -232,6 +232,47 @@ int wiphy_register(struct wiphy *wiphy)
{
struct cfg80211_registered_device *drv = wiphy_to_dev(wiphy);
@@ -129539,8 +129611,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-07-01 13:34:27.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/core.h 2008-07-01 13:34:58.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/core.h.orig 2008-07-03 15:41:02.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/core.h 2008-07-03 15:41:19.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);
@@ -129550,8 +129622,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-07-01 13:34:27.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/Makefile 2008-07-01 13:34:58.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/Makefile.orig 2008-07-03 15:41:02.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/Makefile 2008-07-03 15:41:19.000000000 -0400
@@ -1,5 +1,5 @@
obj-$(CONFIG_WIRELESS_EXT) += wext.o
obj-$(CONFIG_CFG80211) += cfg80211.o
@@ -129560,8 +129632,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-07-01 13:34:27.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/nl80211.c 2008-07-01 13:34:58.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/nl80211.c.orig 2008-07-03 15:41:02.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/nl80211.c 2008-07-03 15:41:20.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,
@@ -130252,8 +130324,8 @@
/* multicast groups */
diff -up /dev/null linux-2.6.25.noarch/net/wireless/reg.c
---- /dev/null 2008-07-01 08:25:54.335004873 -0400
-+++ linux-2.6.25.noarch/net/wireless/reg.c 2008-07-01 13:34:58.000000000 -0400
+--- /dev/null 2008-07-03 09:55:47.025003120 -0400
++++ linux-2.6.25.noarch/net/wireless/reg.c 2008-07-03 15:41:20.000000000 -0400
@@ -0,0 +1,180 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -130436,8 +130508,8 @@
+ handle_band(wiphy->bands[band], rd);
+}
diff -up /dev/null linux-2.6.25.noarch/net/wireless/util.c
---- /dev/null 2008-07-01 08:25:54.335004873 -0400
-+++ linux-2.6.25.noarch/net/wireless/util.c 2008-07-01 13:34:58.000000000 -0400
+--- /dev/null 2008-07-03 09:55:47.025003120 -0400
++++ linux-2.6.25.noarch/net/wireless/util.c 2008-07-03 15:41:20.000000000 -0400
@@ -0,0 +1,121 @@
+/*
+ * Wireless utility functions
@@ -130561,8 +130633,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-07-01 13:34:27.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-01 13:34:58.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-07-03 15:41:02.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-03 15:41:20.000000000 -0400
@@ -1157,7 +1157,7 @@ static void rtmsg_iwinfo(struct net_devi
struct sk_buff *skb;
int err;
More information about the fedora-extras-commits
mailing list