rpms/kernel/F-8 config-generic, 1.70, 1.71 kernel.spec, 1.483, 1.484 linux-2.6-wireless-fixups.patch, 1.5, 1.6 linux-2.6-wireless-pending.patch, 1.50, 1.51 linux-2.6-wireless.patch, 1.45, 1.46
John W. Linville (linville)
fedora-extras-commits at redhat.com
Fri Jul 4 20:49:39 UTC 2008
Author: linville
Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3654
Modified Files:
config-generic 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 ; Upstream wireless updates from 2008-06-30 ; Apply Stefan Beckers fix for bad hunk of wireless build fixups for 2.6.25
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/config-generic,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- config-generic 26 Jun 2008 19:29:52 -0000 1.70
+++ config-generic 4 Jul 2008 20:48:49 -0000 1.71
@@ -1258,7 +1258,7 @@
CONFIG_MAC80211_MESH=y
CONFIG_MAC80211_LEDS=y
CONFIG_MAC80211_DEBUGFS=y
-# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
# CONFIG_MAC80211_DEBUG is not set
CONFIG_IEEE80211=m
CONFIG_IEEE80211_DEBUG=y
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.483
retrieving revision 1.484
diff -u -r1.483 -r1.484
--- kernel.spec 3 Jul 2008 21:27:53 -0000 1.483
+++ kernel.spec 4 Jul 2008 20:48:49 -0000 1.484
@@ -1824,6 +1824,14 @@
%changelog
+* Fri Jul 04 2008 John W. Linville <linville at redhat.com> 2.6.25.9-43
+- Upstream wireless fixes from 2008-07-02
+ (http://marc.info/?l=linux-netdev&m=121503163124089&w=2)
+- Upstream wireless updates from 2008-06-30
+ (http://marc.info/?l=linux-wireless&m=121486432315033&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)
+
* Thu Jul 03 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.9-42
- Linux 2.6.25.10
- Reverted stable patch, not needed with utrace:
linux-2.6-wireless-fixups.patch:
Index: linux-2.6-wireless-fixups.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-wireless-fixups.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-wireless-fixups.patch 2 Jul 2008 21:40:22 -0000 1.5
+++ linux-2.6-wireless-fixups.patch 4 Jul 2008 20:48:49 -0000 1.6
@@ -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.50 -r 1.51 linux-2.6-wireless-pending.patch
Index: linux-2.6-wireless-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/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 2 Jul 2008 21:23:38 -0000 1.50
+++ linux-2.6-wireless-pending.patch 4 Jul 2008 20:48:49 -0000 1.51
@@ -1,3 +1,692 @@
+commit edbf873cb3e8c4ef71123e83b07f39ab69971910
+Author: Larry.Finger at lwfinger.net <Larry.Finger at lwfinger.net>
+Date: Mon Jun 30 10:39:49 2008 -0500
+
+ p54: Add quality output to iwlist and iwconfig
+
+ The p54 driver family reports a quality of 0 in iwconfig and iwlist
+ output. This patch calculates a quality number as a percentage of the
+ rssi to the maximum signal of 127 reported as the maximum signal.
+
+ Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 22191a580c725ed5f285d0084bfa1d2f8b350a47
+Author: Johannes Berg <johannes at sipsolutions.net>
+Date: Mon Jun 30 15:10:46 2008 +0200
+
+ mac80211: rework debug settings and make debugging safer
+
+ This patch reworks the mac80211 debug settings making them more focused
+ and adding help text for those that didn't have one. It also removes a
+ number of printks that can be triggered remotely and add no value, e.g.
+ "too short deauthentication frame received - ignoring".
+
+ If somebody really needs to debug that they should just add a monitor
+ interface and look at the frames in wireshark.
+
+ Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 3f1664e47dcd98b982f34dc39735f2b6706ad7ff
+Author: Johannes Berg <johannes at sipsolutions.net>
+Date: Mon Jun 30 15:10:45 2008 +0200
+
+ mac80211: get rid of function pointers in RX path
+
+ This changes the RX path to no longer use function pointers for
+ RX handlers but rather invoke them directly. If debugging is
+ enabled, mark the RX handlers noinline because otherwise they
+ all get inlined into ieee80211_invoke_rx_handlers() which makes
+ it harder to see where a bug is.
+
+ Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 5807822f3d52179ec0a9091892e88dc4d4d3323b
+Author: Johannes Berg <johannes at sipsolutions.net>
+Date: Mon Jun 30 15:10:44 2008 +0200
+
+ mac80211: get rid of function pointers in TX path
+
+ This changes the TX path to no longer use function pointers for
+ TX handlers but rather invoke them directly. If debugging is
+ enabled, mark the TX handlers noinline because otherwise they
+ all get inlined into invoke_tx_handlers() which makes it harder
+ to see where a bug is.
+
+ Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 444b6135791874d8e78ff47daab86d1b8ee4784f
+Author: Zhu Yi <yi.zhu at intel.com>
+Date: Mon Jun 30 17:23:32 2008 +0800
+
+ iwl3945: remove RFKILL_STATE_HARD_BLOCKED warnings
+
+ The patch fixes the compile warning of "enumeration value
+ ‘RFKILL_STATE_HARD_BLOCKED’ not handled in switch".
+
+ Signed-off-by: Zhu Yi <yi.zhu at intel.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit bd1092ceadee190604d8ff59faa97a974c3c1ecb
+Author: Zhu Yi <yi.zhu at intel.com>
+Date: Mon Jun 30 17:23:31 2008 +0800
+
+ iwlwifi: fix iwl4965 temperature callback calibration issue
+
+ The patch fixes the temperature calibration issue introduced by the
+ patch "iwlwifi: move RX stats to core, and move temperature to handler".
+ It also remove the second parameter "stats" since it is already copied
+ to priv->statistics.
+
+ Signed-off-by: Zhu Yi <yi.zhu at intel.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 82c2e0895d1fa87c3206e3fe5f99dd51e2cf6371
+Author: Stefanik Gábor <netrolller.3d at gmail.com>
+Date: Mon Jun 30 17:23:30 2008 +0800
+
+ iwlwifi: enable packet injection for iwl3945
+
+ This patch enables packet injection on iwl3945 devices. Tested with
+ packetspammer and aireplay-ng.
+
+ Signed-off-by: Gábor Stefanik <netrolller.3d at gmail.com>
+ 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
+
+ iwlwifi: fix incorrect monitor mode operation
+
+ This patch fixes monitor mode operation for iwlwifi.
+
+ Problems addressed:
+ 1. when monitor mode was enabled, multiple, overlapped calls were being
+ made to 'iwl3945_bg_set_monitor'
+
+ 2. when monitor mode was disabled (via the configure_filter callback),
+ the driver was still enabling monitor mode
+
+ 3. when monitor mode was enabled, the selected channel was not set
+ (eg. 'iwconfig wlanx mode monitor channel n' DID NOT SET channel 'n'
+ when packet capture was subsequently enabled)
+
+ 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
+
+ iwlwifi: fix 4965 uCode load
+
+ This patch fixes uCode load in 4965 HW
+
+ Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit a9efa652cbfead13bbe200878f8a2d74f3543e1b
+Author: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
+Date: Mon Jun 30 17:23:25 2008 +0800
+
+ iwlwifi: clean up HW RF-kill state machine and restarts
+
+ This patch cleans up HW RF-kill state machine.
+
+ Signed-off-by: Mohamed Abbas <mohamed.abbas at intel.com>
+ Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
+ Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 154b25ce9218fbe6eebacef7907fabf6d663e639
+Author: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
+Date: Mon Jun 30 17:23:24 2008 +0800
+
+ iwlwifi: blocking mac_start until uCode is complete
+
+ This patch makes iwl4965_mac_start block until the uCode has been
+ completely loaded.
+
+ Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
+ Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
+ Signed-off-by: Zhu Yi <yi.zhu at intel.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 06da0699445631e6710b1f3b2e89570325b65e7e
+Author: Ron Rindjunsky <ron.rindjunsky at intel.com>
+Date: Mon Jun 30 17:23:23 2008 +0800
+
+ iwlwifi: eliminate iwl4965_mac_get_tsf
+
+ This patch removes iwl4965_mac_get_tsf, as this function does not
+ currently reports any actual value.
+
+ Signed-off-by: Ron Rindjunsky <ron.rindjunsky at intel.com>
+ Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
+ Signed-off-by: Zhu Yi <yi.zhu at intel.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit e58942a2ed4386ea19bae4342320d569e025dded
+Author: Abhijeet Kolekar <abhijeet.kolekar at intel.com>
+Date: Mon Jun 30 17:23:22 2008 +0800
+
+ iwlwifi: Remove unnecessary code
+
+ Removed unnecessary goto.
+
+ 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 4977929304306b1b0712f9b99e3cbf95f75c31ea
+Author: Ron Rindjunsky <ron.rindjunsky at intel.com>
+Date: Mon Jun 30 17:23:21 2008 +0800
+
+ iwlwifi: control 11n capabilities through module param
[...17750 lines suppressed...]
+ return RX_DROP_UNUSABLE;
+
+- printk(KERN_DEBUG "%s: invalid Michael MIC in data frame from "
+- "%s\n", rx->dev->name, print_mac(mac, sa));
+-
+ mac80211_ev_michael_mic_failure(rx->dev, rx->key->conf.keyidx,
+ (void *) skb->data);
+ return RX_DROP_UNUSABLE;
+@@ -176,59 +155,58 @@ ieee80211_rx_h_michael_mic_verify(struct
skb_trim(skb, skb->len - MICHAEL_MIC_LEN);
/* update IV in key information to be able to detect replays */
@@ -72357,7 +77347,7 @@
return 0;
}
-@@ -246,28 +227,16 @@ ieee80211_tx_result
+@@ -246,28 +224,16 @@ ieee80211_tx_result
ieee80211_crypto_tkip_encrypt(struct ieee80211_tx_data *tx)
{
struct sk_buff *skb = tx->skb;
@@ -72388,7 +77378,7 @@
return TX_DROP;
}
}
-@@ -280,14 +249,12 @@ ieee80211_rx_result
+@@ -280,14 +246,12 @@ ieee80211_rx_result
ieee80211_crypto_tkip_decrypt(struct ieee80211_rx_data *rx)
{
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) rx->skb->data;
@@ -72404,7 +77394,24 @@
if ((rx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA)
return RX_CONTINUE;
-@@ -429,36 +396,41 @@ static inline int ccmp_hdr2pn(u8 *pn, u8
+@@ -315,15 +279,8 @@ ieee80211_crypto_tkip_decrypt(struct iee
+ hdr->addr1, hwaccel, rx->queue,
+ &rx->tkip_iv32,
+ &rx->tkip_iv16);
+- if (res != TKIP_DECRYPT_OK || wpa_test) {
+-#ifdef CONFIG_MAC80211_DEBUG
+- if (net_ratelimit())
+- printk(KERN_DEBUG "%s: TKIP decrypt failed for RX "
+- "frame from %s (res=%d)\n", rx->dev->name,
+- print_mac(mac, rx->sta->addr), res);
+-#endif /* CONFIG_MAC80211_DEBUG */
++ if (res != TKIP_DECRYPT_OK || wpa_test)
+ return RX_DROP_UNUSABLE;
+- }
+
+ /* Trim ICV */
+ skb_trim(skb, skb->len - TKIP_ICV_LEN);
+@@ -429,36 +386,41 @@ static inline int ccmp_hdr2pn(u8 *pn, u8
}
@@ -72461,7 +77468,7 @@
pos = skb_push(skb, CCMP_HDR_LEN);
memmove(pos, pos + CCMP_HDR_LEN, hdrlen);
-@@ -478,7 +450,7 @@ static int ccmp_encrypt_skb(struct ieee8
+@@ -478,7 +440,7 @@ static int ccmp_encrypt_skb(struct ieee8
if (key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) {
/* hwaccel - with preallocated room for CCMP header */
@@ -72470,7 +77477,7 @@
return 0;
}
-@@ -495,28 +467,16 @@ ieee80211_tx_result
+@@ -495,28 +457,16 @@ ieee80211_tx_result
ieee80211_crypto_ccmp_encrypt(struct ieee80211_tx_data *tx)
{
struct sk_buff *skb = tx->skb;
@@ -72501,7 +77508,7 @@
return TX_DROP;
}
}
-@@ -529,7 +489,6 @@ ieee80211_rx_result
+@@ -529,7 +479,6 @@ ieee80211_rx_result
ieee80211_crypto_ccmp_decrypt(struct ieee80211_rx_data *rx)
{
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) rx->skb->data;
@@ -72509,7 +77516,7 @@
int hdrlen;
struct ieee80211_key *key = rx->key;
struct sk_buff *skb = rx->skb;
-@@ -537,8 +496,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee
+@@ -537,8 +486,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee
int data_len;
DECLARE_MAC_BUF(mac);
@@ -72519,9 +77526,39 @@
if ((rx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA)
return RX_CONTINUE;
+@@ -554,16 +502,6 @@ ieee80211_crypto_ccmp_decrypt(struct iee
+ (void) ccmp_hdr2pn(pn, skb->data + hdrlen);
+
+ if (memcmp(pn, key->u.ccmp.rx_pn[rx->queue], CCMP_PN_LEN) <= 0) {
+-#ifdef CONFIG_MAC80211_DEBUG
+- u8 *ppn = key->u.ccmp.rx_pn[rx->queue];
+-
+- printk(KERN_DEBUG "%s: CCMP replay detected for RX frame from "
+- "%s (RX PN %02x%02x%02x%02x%02x%02x <= prev. PN "
+- "%02x%02x%02x%02x%02x%02x)\n", rx->dev->name,
+- print_mac(mac, rx->sta->addr),
+- pn[0], pn[1], pn[2], pn[3], pn[4], pn[5],
+- ppn[0], ppn[1], ppn[2], ppn[3], ppn[4], ppn[5]);
+-#endif /* CONFIG_MAC80211_DEBUG */
+ key->u.ccmp.replays++;
+ return RX_DROP_UNUSABLE;
+ }
+@@ -583,12 +521,6 @@ ieee80211_crypto_ccmp_decrypt(struct iee
+ skb->data + hdrlen + CCMP_HDR_LEN, data_len,
+ skb->data + skb->len - CCMP_MIC_LEN,
+ skb->data + hdrlen + CCMP_HDR_LEN)) {
+-#ifdef CONFIG_MAC80211_DEBUG
+- if (net_ratelimit())
+- printk(KERN_DEBUG "%s: CCMP decrypt failed "
+- "for RX frame from %s\n", rx->dev->name,
+- print_mac(mac, rx->sta->addr));
+-#endif /* CONFIG_MAC80211_DEBUG */
+ return RX_DROP_UNUSABLE;
+ }
+ }
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-04-16 22:49:44.000000000 -0400
-+++ linux-2.6.25.noarch/net/rfkill/rfkill.c 2008-06-30 14:05:20.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);
@@ -72983,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-04-16 22:49:44.000000000 -0400
-+++ linux-2.6.25.noarch/net/rfkill/rfkill-input.c 2008-06-30 14:05:20.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 */
@@ -73142,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-04-16 22:49:44.000000000 -0400
-+++ linux-2.6.25.noarch/net/rfkill/rfkill-input.h 2008-06-30 14:05:20.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
@@ -73152,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-04-16 22:49:44.000000000 -0400
-+++ linux-2.6.25.noarch/net/socket.c 2008-06-30 14:05:20.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>
@@ -73183,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-06-30 14:03:46.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/core.c 2008-06-30 14:04:54.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)
@@ -73248,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-04-16 22:49:44.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-06-30 14:04:55.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;
@@ -73291,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-06-30 14:03:46.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/wext.c 2008-06-30 14:05:20.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.45 -r 1.46 linux-2.6-wireless.patch
Index: linux-2.6-wireless.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-wireless.patch,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- linux-2.6-wireless.patch 2 Jul 2008 21:23:38 -0000 1.45
+++ linux-2.6-wireless.patch 4 Jul 2008 20:48:50 -0000 1.46
@@ -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