rpms/kernel/F-9 config-generic, 1.105, 1.106 kernel.spec, 1.699, 1.700 linux-2.6-wireless-pending.patch, 1.54, 1.55
John W. Linville (linville)
fedora-extras-commits at redhat.com
Wed Jul 2 22:05:18 UTC 2008
Author: linville
Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29159
Modified Files:
config-generic kernel.spec linux-2.6-wireless-pending.patch
Log Message:
Upstream wireless updates from 2008-06-30
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/config-generic,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- config-generic 30 Jun 2008 19:38:16 -0000 1.105
+++ config-generic 2 Jul 2008 22:04:18 -0000 1.106
@@ -1255,7 +1255,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-9/kernel.spec,v
retrieving revision 1.699
retrieving revision 1.700
diff -u -r1.699 -r1.700
--- kernel.spec 2 Jul 2008 02:13:21 -0000 1.699
+++ kernel.spec 2 Jul 2008 22:04:18 -0000 1.700
@@ -1861,6 +1861,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
+* Wed Jul 02 2008 John W. Linville <linville at redhat.com> 2.6.25.9-81
+- Upstream wireless updates from 2008-06-30
+ (http://marc.info/?l=linux-wireless&m=121486432315033&w=2)
+
* Tue Jul 01 2008 Dave Jones <davej at redhat.com>
- Shorten summary in specfile.
linux-2.6-wireless-pending.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.54 -r 1.55 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.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- linux-2.6-wireless-pending.patch 1 Jul 2008 18:42:13 -0000 1.54
+++ linux-2.6-wireless-pending.patch 2 Jul 2008 22:04:18 -0000 1.55
@@ -1,3 +1,721 @@
+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 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
+
+ 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 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
+
+ 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>
[...17752 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 +77365,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 +77396,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 +77412,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 +77486,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 +77495,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 +77526,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 +77534,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 +77544,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-02 17:33:16.000000000 -0400
++++ linux-2.6.25.noarch/net/rfkill/rfkill.c 2008-07-02 17:33:30.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 +78038,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-02 17:33:16.000000000 -0400
++++ linux-2.6.25.noarch/net/rfkill/rfkill-input.c 2008-07-02 17:33:30.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 +78197,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-02 17:33:16.000000000 -0400
++++ linux-2.6.25.noarch/net/rfkill/rfkill-input.h 2008-07-02 17:33:30.000000000 -0400
@@ -12,5 +12,6 @@
#define __RFKILL_INPUT_H
@@ -73152,8 +78207,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-02 17:33:16.000000000 -0400
++++ linux-2.6.25.noarch/net/socket.c 2008-07-02 17:33:30.000000000 -0400
@@ -90,6 +90,7 @@
#include <asm/unistd.h>
@@ -73183,8 +78238,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-02 17:33:16.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/core.c 2008-07-02 17:33:30.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 +78303,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-02 17:33:16.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-07-02 17:33:30.000000000 -0400
@@ -59,23 +59,21 @@ int ieee80211_radiotap_iterator_init(
return -EINVAL;
@@ -73291,8 +78346,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-02 17:33:16.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/wext.c 2008-07-02 17:33:30.000000000 -0400
@@ -500,7 +500,7 @@ static int call_commit_handler(struct ne
/*
* Calculate size of private arguments
More information about the fedora-extras-commits
mailing list