rpms/kernel/devel linux-2.6-wireless-fixes.patch, NONE, 1.1 kernel.spec, 1.361, 1.362 linux-2.6-wireless-pending.patch, 1.23, 1.24
Kyle McMartin (kyle)
fedora-extras-commits at redhat.com
Mon Jan 14 22:58:05 UTC 2008
Author: kyle
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9385
Modified Files:
kernel.spec linux-2.6-wireless-pending.patch
Added Files:
linux-2.6-wireless-fixes.patch
Log Message:
* Mon Jan 14 2008 Kyle McMartin <kmcmartin at redhat.com>
- Remerge linux-2.6-wireless-pending bits.
- Fixup rt2x00 build due to automerge lossage.
linux-2.6-wireless-fixes.patch:
--- NEW FILE linux-2.6-wireless-fixes.patch ---
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c
index 229220a..dbc23c4 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
@@ -128,7 +128,6 @@ void rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev)
struct data_ring *ring = rt2x00dev->rx;
struct data_entry *entry;
struct sk_buff *skb;
- struct ieee80211_hdr *hdr;
struct skb_desc *skbdesc;
struct ieee80211_hdr *hdr;
struct rxdata_entry_desc desc;
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c
index 3c7de2f..2bb28e6 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c
@@ -240,7 +240,6 @@ static void rt2x00usb_interrupt_rxdone(struct urb *urb)
struct data_ring *ring = entry->ring;
struct rt2x00_dev *rt2x00dev = ring->rt2x00dev;
struct sk_buff *skb;
- struct ieee80211_hdr *hdr;
struct skb_desc *skbdesc;
struct ieee80211_hdr *hdr;
struct rxdata_entry_desc desc;
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -r1.361 -r1.362
--- kernel.spec 14 Jan 2008 18:03:35 -0000 1.361
+++ kernel.spec 14 Jan 2008 22:57:07 -0000 1.362
@@ -623,6 +623,7 @@
Patch680: linux-2.6-wireless.patch
Patch681: linux-2.6-wireless-pending.patch
Patch682: linux-2.6-wireless-pending-too.patch
+Patch683: linux-2.6-wireless-fixes.patch
Patch690: linux-2.6-at76.patch
Patch691: linux-2.6-ath5k.patch
Patch692: linux-2.6-rtl8180.patch
@@ -1139,6 +1140,9 @@
# Some more 2.6.25 stuff, here due to upstream process anomalies...
ApplyPatch linux-2.6-wireless-pending-too.patch
+# wireless build fixes
+ApplyPatch linux-2.6-wireless-fixes.patch
+
# implement smarter atime updates support.
ApplyPatch linux-2.6-smarter-relatime.patch
@@ -1754,6 +1758,10 @@
%changelog
* Mon Jan 14 2008 Kyle McMartin <kmcmartin at redhat.com>
+- Remerge linux-2.6-wireless-pending bits.
+- Fixup rt2x00 build due to automerge lossage.
+
+* Mon Jan 14 2008 Kyle McMartin <kmcmartin at redhat.com>
- 2.6.24-rc7-git5
* Mon Jan 14 2008 Eric Sandeen <sandeen at redhat.com>
linux-2.6-wireless-pending.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.23 -r 1.24 linux-2.6-wireless-pending.patch
Index: linux-2.6-wireless-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless-pending.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- linux-2.6-wireless-pending.patch 14 Jan 2008 18:03:35 -0000 1.23
+++ linux-2.6-wireless-pending.patch 14 Jan 2008 22:57:07 -0000 1.24
@@ -1,4 +1,10 @@
-commit 30fadc8a30f099fa2742426dd473c14d356f5967
+commit e1554f4ce90dcc6a9fb0163201071447fe4384ff
+Author: Jeff Garzik <jeff at garzik.org>
+Date: Sun Dec 23 00:24:41 2007 -0500
+
+ wireless/iwl: fix namespace breakage
+
+commit 1e208efd3a61482fb65a63d308708f1f9ec3a852
Author: John W. Linville <linville at tuxdriver.com>
Date: Thu Jan 10 13:37:45 2008 -0500
@@ -6,7 +12,7 @@
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit 06c31b59d6694b791d5218e1d48a00195623ccad
+commit d5599cd728c936e08294b948cc053dfec0a8e2fa
Author: John W. Linville <linville at tuxdriver.com>
Date: Thu Jan 10 13:28:49 2008 -0500
@@ -16,7 +22,7 @@
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit 60ae1762057ff2716c95362843d9d8f8a0287221
+commit 731d4f1a1610336968ee6007256d7443ebf430a1
Author: Pavel Roskin <proski at gnu.org>
Date: Wed Jan 9 22:16:58 2008 -0500
@@ -32,7 +38,7 @@
Signed-off-by: Pavel Roskin <proski at gnu.org>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit 7a1a6c289afeec831d154ebfa08ec26581dd4f9d
+commit 8243bd78e6b335021401dba74644f1c8a39867ac
Author: Michael Buesch <mb at bu3sch.de>
Date: Wed Jan 9 19:08:49 2008 +0100
@@ -46,7 +52,7 @@
Signed-off-by: Michael Buesch <mb at bu3sch.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit 65127e870fb778cbef89fe6b2c4bf8a89c2ccb95
+commit e2804066b09d966331add1fb6594b268770f440b
Author: Michael Buesch <mb at bu3sch.de>
Date: Wed Jan 9 18:39:09 2008 +0100
@@ -59,7 +65,7 @@
Signed-off-by: Michael Buesch <mb at bu3sch.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit dc3ebde98d1bdedbdef4481729f2df36828f5064
+commit 8e7e843463a1b337ea3bfaf7bf7ab5cce3b3ced5
Author: Michael Buesch <mb at bu3sch.de>
Date: Wed Jan 9 16:13:56 2008 +0100
@@ -72,7 +78,7 @@
Signed-off-by: Michael Buesch <mb at bu3sch.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit ad0bda5262442aed48682a20c03d851ffc796e5e
+commit 2f380ba73c8b1269c494cccc26db819eb66ad73d
Author: Michael Buesch <mb at bu3sch.de>
Date: Sat Dec 29 17:24:23 2007 +0100
@@ -84,7 +90,7 @@
Signed-off-by: Michael Buesch <mb at bu3sch.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit a389e0fce7eb152efd7bd4cf5a0b5c95fc9fede8
+commit 563b0e3b70a9c480593c09853e0523a0b8ed5c25
Author: Miguel Botón <mboton.lkml at gmail.com>
Date: Fri Jan 4 23:34:35 2008 +0100
@@ -97,7 +103,7 @@
Signed-off-by: Miguel Botón <mboton at gmail.com
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit fa874d305a2eea9383a9593925d8be733f5f21d5
+commit 86a7ded3b65205142b3fd14b3e7f68035227ff23
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sun Jan 6 23:42:21 2008 +0100
@@ -106,7 +112,7 @@
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit d19f9104b8270a5720d9da5ad2a45c80dd78df50
+commit c908f84e0f19a463a62ca7e3272afd0ae60db849
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sun Jan 6 23:42:04 2008 +0100
@@ -119,7 +125,7 @@
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit 68a9a72a7e132d0eab48b770f04899dfdb568a26
+commit d768680de5d76b643d4a380bcc06d18956e46a4b
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sun Jan 6 23:41:45 2008 +0100
@@ -132,7 +138,7 @@
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit 1af21f6d3d73db1cde8a2df222b4f4b67a2608d5
+commit ac4e616cd0eaac7620cc5a640e035575d6193126
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sun Jan 6 23:41:28 2008 +0100
@@ -146,7 +152,7 @@
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit 6005a5397a3feea0761032c763b73ac4a848f70e
+commit 25a0912155f7486f448413287e6c082650fad83f
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sun Jan 6 23:41:10 2008 +0100
@@ -161,7 +167,7 @@
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit 6beb37bf7535759a6332040d1899d67f4595709a
+commit 2a5a533330a59d4bfa914ef7db4745c687429f4d
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sun Jan 6 23:40:49 2008 +0100
@@ -177,7 +183,7 @@
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit 92726e29d006a6fe85a5a505d5d0818a588e1fd6
+commit 0007001f6886dafde183065f685b80fad91995c8
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sun Jan 6 23:40:27 2008 +0100
@@ -190,7 +196,7 @@
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit 9c762ec8f9d8456bf263843c772c97cc28d1fed0
+commit 686f0140bd96ddfecb1e1ba435f60bb40adaa69e
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sun Jan 6 23:40:07 2008 +0100
@@ -208,7 +214,7 @@
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit 2ad8ead3a5abdce6231122f42b777264bd791c55
+commit bef19bcd521b16181a5a22bbec1d9c8f68d78ffd
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sun Jan 6 23:39:25 2008 +0100
@@ -221,7 +227,7 @@
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit 1ba041bda898afaa79b80c92226d1880e80a81f8
+commit 13f5e473d6c966ef85bb533de23bb7358cf8f8e5
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sun Jan 6 23:38:58 2008 +0100
@@ -240,7 +246,7 @@
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit ea3ff70609f3c73a96de9a1724a853f433c93e41
+commit 7a74a8fbee9fff2c8ff5ec9551ca6d3e631f91b3
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sun Jan 6 23:38:34 2008 +0100
@@ -254,7 +260,7 @@
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit de72060aa965b74374181175e26b95082fa957c7
+commit 72ad6704d3334d5d7200d15600f454564b5f00df
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sun Jan 6 23:38:10 2008 +0100
@@ -268,7 +274,7 @@
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit 1c46877fd88f61b3779beaac7eae34b9f665fd5d
+commit f77bba700db86ebd6d217783e64565b7f6e37398
Author: Michael Buesch <mb at bu3sch.de>
Date: Sun Jan 6 00:09:46 2008 +0100
[...3676 lines suppressed...]
-commit 366bd4f98fd34ebcd46cde0062d4550749ff4ddb
+commit 46a803abf6e79ab164c15316390d578301f6b709
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sat Oct 27 13:42:18 2007 +0200
@@ -5631,7 +5637,7 @@
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit 96de0c74759b948a7e49db111076b37f18d8a135
+commit 644d2a3281b21ad1e03013b0191eae024a8cab32
Author: Mattias Nissler <mattias.nissler at gmx.de>
Date: Sat Oct 27 13:41:53 2007 +0200
@@ -5646,7 +5652,7 @@
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit 6825d1d4849282ee8844e2613425f29a1652d727
+commit dd6662e6d91f5ec494d45ec9392b996f05e1ac4d
Author: Adam Baker <linux at baker-net.org.uk>
Date: Sat Oct 27 13:41:25 2007 +0200
@@ -5659,7 +5665,7 @@
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit f1cc0292c8408b33476bffe2ec86d472c985fa03
+commit e670ec3344f33b642364b6373043b18c576df2df
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sat Oct 27 13:40:51 2007 +0200
@@ -5672,7 +5678,7 @@
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit baa9ef61b7303e6eb5d426cedbebd6d2e6de4598
+commit 139f1f68857464da2ba63061396d78e0455087b8
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sat Oct 27 13:40:25 2007 +0200
@@ -5687,7 +5693,7 @@
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit 5a00b74cc7a9e7d7b07d780b74b41085d84427ed
+commit 917ad8f997a91a776f9823d6d7f6c71695c3a0b8
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sat Oct 27 13:39:57 2007 +0200
@@ -5706,7 +5712,7 @@
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit 9947a86ab24bde89f0d3953e499c0a8aa5d9ce44
+commit 32915477e1af8513e0563b68fcc8870a93eac44d
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sat Oct 27 13:39:28 2007 +0200
@@ -5719,7 +5725,7 @@
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit 5fb349d5a57357c0b8a7e10cecc2ade51989da1a
+commit 6b2518b1285664be01625fc415b25805d6e21793
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sat Oct 13 16:27:16 2007 +0200
@@ -5730,7 +5736,7 @@
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit 4b448cfe5fafd0296bd8d972e3561d95c6b4a335
+commit 4bf7419a4d6b6f339a3d738a4657dd2c01e89878
Author: Mattias Nissler <mattias.nissler at gmx.de>
Date: Sat Oct 13 16:26:57 2007 +0200
@@ -5744,7 +5750,7 @@
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit 77d4f0460e37465e46ec5d8d1792fddea28da573
+commit 425edd94859b5f32a2bd59051368d939c1eccaff
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sat Oct 13 16:26:42 2007 +0200
@@ -5759,7 +5765,7 @@
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit 2cd2a56960f69b93a4958a49f529ce910ef46861
+commit de5f00f8017cdc1b380cc87d40465f26ce816bbb
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sat Oct 13 16:26:36 2007 +0200
@@ -5777,7 +5783,7 @@
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit 477e7e4d2151883583daa611e392082727f7b50a
+commit c43d8cc9feee42c2eb59999355c47d3f131f1cd8
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sat Oct 13 16:26:32 2007 +0200
@@ -5791,7 +5797,7 @@
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit 28ae239a52cb2fc8c8a088361c3331fbee414681
+commit cc4816eb346ea1472f442bb894e70e1150148886
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sat Oct 13 16:26:27 2007 +0200
@@ -5805,7 +5811,7 @@
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit 01588c860e7bc24c2c44cdebb8727bb91b1b0607
+commit 9f5d3e451c87cd89748dc684fd99ec8898773af8
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sat Oct 13 16:26:23 2007 +0200
@@ -5829,7 +5835,7 @@
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit 80e2e2217475c8b221fe250e67aef6d479aac48f
+commit 38fc65c20054d4f6dbdd3467f75dc0e2f409e2d6
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sat Oct 13 16:26:18 2007 +0200
@@ -5841,7 +5847,7 @@
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
-commit 821dba4cb340df7bbc3dd27ec507ebd35d09ecd8
+commit ac6eb5b9435ca2f7b8799c22c4fcb351aaedb216
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sat Oct 13 16:26:12 2007 +0200
@@ -42131,7 +42137,7 @@
+
#endif /* __iwl_prph_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
-index 1a6b0e0..49d934a 100644
+index 1a6b0e0..e5868e6 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -27,16 +27,6 @@
@@ -47265,7 +47271,7 @@
priv->status = test_bit(STATUS_RF_KILL_HW, &priv->status) <<
STATUS_RF_KILL_HW |
test_bit(STATUS_RF_KILL_SW, &priv->status) <<
-@@ -6284,41 +6304,41 @@ static void __iwl_down(struct iwl_priv *priv)
+@@ -6284,49 +6304,49 @@ static void __iwl_down(struct iwl_priv *priv)
STATUS_FW_ERROR;
spin_lock_irqsave(&priv->lock, flags);
@@ -47319,8 +47325,9 @@
+ __iwl3945_down(priv);
mutex_unlock(&priv->mutex);
- iwl_cancel_deferred_work(priv);
-@@ -6326,7 +6346,7 @@ static void iwl_down(struct iwl_priv *priv)
+- iwl_cancel_deferred_work(priv);
++ iwl3945_cancel_deferred_work(priv);
+ }
#define MAX_HW_RESTARTS 5
@@ -49470,7 +49477,7 @@
+module_exit(iwl3945_exit);
+module_init(iwl3945_init);
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
-index 6cd57c2..f097c72 100644
+index 6cd57c2..f5f7fcd 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -27,16 +27,6 @@
@@ -55093,7 +55100,7 @@
priv->status = test_bit(STATUS_RF_KILL_HW, &priv->status) <<
STATUS_RF_KILL_HW |
test_bit(STATUS_RF_KILL_SW, &priv->status) <<
-@@ -6639,41 +6717,42 @@ static void __iwl_down(struct iwl_priv *priv)
+@@ -6639,49 +6717,50 @@ static void __iwl_down(struct iwl_priv *priv)
STATUS_FW_ERROR;
spin_lock_irqsave(&priv->lock, flags);
@@ -55148,8 +55155,9 @@
+ __iwl4965_down(priv);
mutex_unlock(&priv->mutex);
- iwl_cancel_deferred_work(priv);
-@@ -6681,7 +6760,7 @@ static void iwl_down(struct iwl_priv *priv)
+- iwl_cancel_deferred_work(priv);
++ iwl4965_cancel_deferred_work(priv);
+ }
#define MAX_HW_RESTARTS 5
More information about the fedora-extras-commits
mailing list