rpms/kernel/F-9 kernel.spec, 1.692, 1.693 linux-2.6-wireless-pending.patch, 1.52, 1.53 linux-2.6-wireless.patch, 1.40, 1.41
John W. Linville (linville)
fedora-extras-commits at redhat.com
Wed Jun 25 19:30:28 UTC 2008
- Previous message (by thread): rpms/swfdec/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 swfdec.spec, 1.12, 1.13
- Next message (by thread): rpms/swfdec-mozilla/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 swfdec-mozilla.spec, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: linville
Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13431
Modified Files:
kernel.spec linux-2.6-wireless-pending.patch
linux-2.6-wireless.patch
Log Message:
Upstream wireless fixes from 2008-06-25
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.692
retrieving revision 1.693
diff -u -r1.692 -r1.693
--- kernel.spec 25 Jun 2008 17:38:37 -0000 1.692
+++ kernel.spec 25 Jun 2008 19:29:30 -0000 1.693
@@ -1853,6 +1853,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 Jun 25 2008 John W. Linville <linville at redhat.com> 2.6.25.9-74
+- Upstream wireless fixes from 2008-06-25
+ (http://marc.info/?l=linux-wireless&m=121440912502527&w=2)
+
* Tue Jun 24 2008 John W. Linville <linville at redhat.com> 2.6.25.9-73
- Upstream wireless updates from 2008-06-14
(http://marc.info/?l=linux-netdev&m=121346686508160&w=2)
linux-2.6-wireless-pending.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.52 -r 1.53 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.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- linux-2.6-wireless-pending.patch 25 Jun 2008 17:38:37 -0000 1.52
+++ linux-2.6-wireless-pending.patch 25 Jun 2008 19:29:30 -0000 1.53
@@ -4861,8 +4861,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-06-24 08:03:09.439004351 -0400
-+++ linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/hostapd.conf 2008-06-24 14:48:48.000000000 -0400
+--- /dev/null 2008-06-25 08:17:03.992002591 -0400
++++ linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/hostapd.conf 2008-06-25 14:45:46.000000000 -0400
@@ -0,0 +1,11 @@
+interface=wlan0
+driver=nl80211
@@ -4876,8 +4876,8 @@
+wpa_pairwise=CCMP
+wpa_passphrase=12345678
diff -up /dev/null linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/README
---- /dev/null 2008-06-24 08:03:09.439004351 -0400
-+++ linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/README 2008-06-24 14:48:48.000000000 -0400
+--- /dev/null 2008-06-25 08:17:03.992002591 -0400
++++ linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/README 2008-06-25 14:45:46.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>
@@ -4947,8 +4947,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-06-24 08:03:09.439004351 -0400
-+++ linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/wpa_supplicant.conf 2008-06-24 14:48:48.000000000 -0400
+--- /dev/null 2008-06-25 08:17:03.992002591 -0400
++++ linux-2.6.25.noarch/Documentation/networking/mac80211_hwsim/wpa_supplicant.conf 2008-06-25 14:45:46.000000000 -0400
@@ -0,0 +1,10 @@
+ctrl_interface=/var/run/wpa_supplicant
+
@@ -4961,8 +4961,8 @@
+ group=CCMP
+}
diff -up linux-2.6.25.noarch/drivers/net/Kconfig.orig linux-2.6.25.noarch/drivers/net/Kconfig
---- linux-2.6.25.noarch/drivers/net/Kconfig.orig 2008-06-24 14:47:33.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/Kconfig 2008-06-24 14:47:53.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/Kconfig.orig 2008-06-25 14:44:53.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/Kconfig 2008-06-25 14:45:46.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.
@@ -4984,8 +4984,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-06-24 14:47:33.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/ps3_gelic_net.c 2008-06-24 14:47:53.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/ps3_gelic_net.c.orig 2008-04-16 22:49:44.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/ps3_gelic_net.c 2008-06-25 14:45:46.000000000 -0400
@@ -110,7 +110,7 @@ static void gelic_card_get_ether_port_st
void gelic_card_up(struct gelic_card *card)
{
@@ -5032,8 +5032,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-06-24 14:47:33.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/ps3_gelic_net.h 2008-06-24 14:47:53.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/ps3_gelic_net.h.orig 2008-04-16 22:49:44.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/ps3_gelic_net.h 2008-06-25 14:45:46.000000000 -0400
@@ -278,7 +278,7 @@ struct gelic_card {
wait_queue_head_t waitq;
@@ -5044,8 +5044,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-06-24 14:47:33.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.c 2008-06-24 14:47:53.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.c.orig 2008-06-25 13:28:50.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.c 2008-06-25 14:45:46.000000000 -0400
@@ -45,7 +45,8 @@
#include "ps3_gelic_wireless.h"
@@ -5588,8 +5588,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-06-24 14:47:33.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.h 2008-06-24 14:47:53.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.h.orig 2008-04-16 22:49:44.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.h 2008-06-25 14:45:46.000000000 -0400
@@ -241,7 +241,7 @@ enum gelic_wl_assoc_state {
#define GELIC_WEP_KEYS 4
struct gelic_wl_info {
@@ -5619,8 +5619,8 @@
struct iw_statistics iwstat;
};
diff -up linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig linux-2.6.25.noarch/drivers/net/wireless/adm8211.c
---- linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig 2008-06-24 14:47:33.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-06-24 14:47:53.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig 2008-06-25 14:44:52.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-06-25 14:45:46.000000000 -0400
@@ -306,11 +306,10 @@ static int adm8211_get_tx_stats(struct i
struct ieee80211_tx_queue_stats *stats)
{
@@ -5769,8 +5769,8 @@
return 0;
diff -up linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig linux-2.6.25.noarch/drivers/net/wireless/adm8211.h
---- linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig 2008-06-24 14:47:33.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-06-24 14:47:53.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig 2008-06-25 14:44:52.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-06-25 14:45:46.000000000 -0400
@@ -443,7 +443,6 @@ struct adm8211_rx_ring_info {
struct adm8211_tx_ring_info {
struct sk_buff *skb;
@@ -5780,8 +5780,8 @@
};
diff -up linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig linux-2.6.25.noarch/drivers/net/wireless/airo.c
---- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-06-24 14:47:33.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-06-24 14:48:48.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-06-25 14:44:52.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-06-25 14:45:46.000000000 -0400
@@ -1148,7 +1148,6 @@ static u8 airo_dbm_to_pct (tdsRssiEntry
static void airo_networks_free(struct airo_info *ai);
@@ -5976,8 +5976,8 @@
/*
diff -up linux-2.6.25.noarch/drivers/net/wireless/arlan.h.orig linux-2.6.25.noarch/drivers/net/wireless/arlan.h
---- linux-2.6.25.noarch/drivers/net/wireless/arlan.h.orig 2008-06-24 14:47:33.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/arlan.h 2008-06-24 14:47:53.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/arlan.h.orig 2008-04-16 22:49:44.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/arlan.h 2008-06-25 14:45:46.000000000 -0400
@@ -330,7 +330,6 @@ struct TxParam
#define TX_RING_SIZE 2
/* Information that need to be kept for each board. */
@@ -5987,8 +5987,8 @@
struct arlan_shmem * conf;
diff -up linux-2.6.25.noarch/drivers/net/wireless/arlan-main.c.orig linux-2.6.25.noarch/drivers/net/wireless/arlan-main.c
---- linux-2.6.25.noarch/drivers/net/wireless/arlan-main.c.orig 2008-06-24 14:47:33.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/arlan-main.c 2008-06-24 14:47:53.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/arlan-main.c.orig 2008-04-16 22:49:44.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/arlan-main.c 2008-06-25 14:45:46.000000000 -0400
@@ -125,7 +125,7 @@ static inline int arlan_drop_tx(struct n
{
struct arlan_private *priv = netdev_priv(dev);
@@ -6073,8 +6073,8 @@
diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c
---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-06-24 14:47:33.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-06-24 14:47:53.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-06-25 14:44:52.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-06-25 14:45:46.000000000 -0400
@@ -167,8 +167,7 @@ static struct pci_driver ath5k_pci_drive
/*
* Prototypes - MAC 802.11 stack related functions
@@ -6364,8 +6364,8 @@
sc->bbuf->skb = NULL;
else
diff -up linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h
---- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-06-24 14:47:33.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h 2008-06-24 14:47:53.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-06-25 14:44:52.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h 2008-06-25 14:45:46.000000000 -0400
@@ -60,7 +60,6 @@ struct ath5k_buf {
dma_addr_t daddr; /* physical addr of desc */
struct sk_buff *skb; /* skbuff for buf */
@@ -6385,8 +6385,8 @@
struct ieee80211_hw *hw; /* IEEE 802.11 common */
struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];
diff -up linux-2.6.25.noarch/drivers/net/wireless/atmel.c.orig linux-2.6.25.noarch/drivers/net/wireless/atmel.c
---- linux-2.6.25.noarch/drivers/net/wireless/atmel.c.orig 2008-06-24 14:47:33.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/atmel.c 2008-06-24 14:47:53.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/atmel.c.orig 2008-06-25 14:44:52.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/atmel.c 2008-06-25 14:45:46.000000000 -0400
@@ -433,7 +433,6 @@ struct atmel_private {
struct net_device *dev;
struct device *sys_dev;
@@ -6566,8 +6566,8 @@
dev->do_ioctl = atmel_ioctl;
dev->irq = irq;
diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h.orig linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h
---- linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h.orig 2008-06-24 14:47:33.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h 2008-06-24 14:47:53.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h.orig 2008-06-25 14:44:52.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h 2008-06-25 14:45:46.000000000 -0400
@@ -410,8 +410,7 @@ enum {
#define B43_IRQ_TIMEOUT 0x80000000
@@ -6651,8 +6651,8 @@
#define INT_TO_Q52(i) ((i) << 2)
/* Convert a Q5.2 value to an integer (precision loss!) */
diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/debugfs.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43/debugfs.c
---- linux-2.6.25.noarch/drivers/net/wireless/b43/debugfs.c.orig 2008-06-24 14:47:33.000000000 -0400
[...4497 lines suppressed...]
@@ -60567,7 +60587,7 @@
(*num_beacons)++;
out:
rcu_read_unlock();
-@@ -1911,7 +1910,7 @@ EXPORT_SYMBOL(ieee80211_beacon_get);
+@@ -1918,7 +1917,7 @@ EXPORT_SYMBOL(ieee80211_beacon_get);
void ieee80211_rts_get(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
const void *frame, size_t frame_len,
@@ -60576,7 +60596,7 @@
struct ieee80211_rts *rts)
{
const struct ieee80211_hdr *hdr = frame;
-@@ -1928,7 +1927,7 @@ EXPORT_SYMBOL(ieee80211_rts_get);
+@@ -1935,7 +1934,7 @@ EXPORT_SYMBOL(ieee80211_rts_get);
void ieee80211_ctstoself_get(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
const void *frame, size_t frame_len,
@@ -60585,7 +60605,7 @@
struct ieee80211_cts *cts)
{
const struct ieee80211_hdr *hdr = frame;
-@@ -1944,11 +1943,10 @@ EXPORT_SYMBOL(ieee80211_ctstoself_get);
+@@ -1951,11 +1950,10 @@ EXPORT_SYMBOL(ieee80211_ctstoself_get);
struct sk_buff *
ieee80211_get_buffered_bc(struct ieee80211_hw *hw,
@@ -60599,7 +60619,7 @@
struct sta_info *sta;
ieee80211_tx_handler *handler;
struct ieee80211_tx_data tx;
-@@ -1957,10 +1955,11 @@ ieee80211_get_buffered_bc(struct ieee802
+@@ -1964,10 +1962,11 @@ ieee80211_get_buffered_bc(struct ieee802
struct ieee80211_sub_if_data *sdata;
struct ieee80211_if_ap *bss = NULL;
struct beacon_data *beacon;
@@ -60612,7 +60632,7 @@
if (!bss)
return NULL;
-@@ -1968,19 +1967,16 @@ ieee80211_get_buffered_bc(struct ieee802
+@@ -1975,19 +1974,16 @@ ieee80211_get_buffered_bc(struct ieee802
rcu_read_lock();
beacon = rcu_dereference(bss->beacon);
@@ -60637,7 +60657,7 @@
local->total_ps_buffered--;
if (!skb_queue_empty(&bss->ps_bc_buf) && skb->len >= 2) {
-@@ -1993,20 +1989,26 @@ ieee80211_get_buffered_bc(struct ieee802
+@@ -2000,20 +1996,26 @@ ieee80211_get_buffered_bc(struct ieee802
cpu_to_le16(IEEE80211_FCTL_MOREDATA);
}
@@ -60666,7 +60686,7 @@
if (res == TX_DROP) {
I802_DEBUG_INC(local->tx_handlers_drop);
-@@ -2017,6 +2019,7 @@ ieee80211_get_buffered_bc(struct ieee802
+@@ -2024,6 +2026,7 @@ ieee80211_get_buffered_bc(struct ieee802
skb = NULL;
}
@@ -60675,8 +60695,8 @@
return skb;
diff -up linux-2.6.25.noarch/net/mac80211/util.c.orig linux-2.6.25.noarch/net/mac80211/util.c
---- linux-2.6.25.noarch/net/mac80211/util.c.orig 2008-06-24 14:47:34.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/util.c 2008-06-24 14:48:48.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/util.c.orig 2008-06-25 14:44:53.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/util.c 2008-06-25 14:45:47.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)
@@ -60928,8 +60948,8 @@
}
EXPORT_SYMBOL(ieee80211_wake_queues);
diff -up linux-2.6.25.noarch/net/mac80211/wep.c.orig linux-2.6.25.noarch/net/mac80211/wep.c
---- linux-2.6.25.noarch/net/mac80211/wep.c.orig 2008-06-24 14:47:34.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-06-24 14:47:54.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wep.c.orig 2008-06-25 14:44:53.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-06-25 14:45:47.000000000 -0400
@@ -93,13 +93,9 @@ static u8 *ieee80211_wep_add_iv(struct i
fc |= IEEE80211_FCTL_PROTECTED;
hdr->frame_control = cpu_to_le16(fc);
@@ -60975,8 +60995,8 @@
if (wep_encrypt_skb(tx, tx->skb) < 0) {
diff -up linux-2.6.25.noarch/net/mac80211/wep.h.orig linux-2.6.25.noarch/net/mac80211/wep.h
---- linux-2.6.25.noarch/net/mac80211/wep.h.orig 2008-06-24 14:47:34.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-06-24 14:47:54.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wep.h.orig 2008-06-25 14:44:53.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-06-25 14:45:47.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,
@@ -60987,8 +61007,8 @@
ieee80211_rx_result
ieee80211_crypto_wep_decrypt(struct ieee80211_rx_data *rx);
diff -up linux-2.6.25.noarch/net/mac80211/wext.c.orig linux-2.6.25.noarch/net/mac80211/wext.c
---- linux-2.6.25.noarch/net/mac80211/wext.c.orig 2008-06-24 14:47:34.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-06-24 14:47:54.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wext.c.orig 2008-06-25 14:44:53.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-06-25 14:45:47.000000000 -0400
@@ -169,14 +169,26 @@ static int ieee80211_ioctl_giwrange(stru
range->num_encoding_sizes = 2;
range->max_encoding_tokens = NUM_DEFAULT_KEYS;
@@ -61034,8 +61054,8 @@
wstats->qual.updated = local->wstats_flags;
}
diff -up linux-2.6.25.noarch/net/mac80211/wme.c.orig linux-2.6.25.noarch/net/mac80211/wme.c
---- linux-2.6.25.noarch/net/mac80211/wme.c.orig 2008-06-24 14:47:34.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-06-24 14:48:48.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wme.c.orig 2008-06-25 14:44:53.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-06-25 14:45:47.000000000 -0400
@@ -19,16 +19,22 @@
#include "wme.h"
@@ -61440,8 +61460,8 @@
if (requeue)
ieee80211_requeue(local, agg_queue);
diff -up linux-2.6.25.noarch/net/mac80211/wme.h.orig linux-2.6.25.noarch/net/mac80211/wme.h
---- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-06-24 14:47:34.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-06-24 14:47:54.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-06-25 14:44:53.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-06-25 14:45:47.000000000 -0400
@@ -31,7 +31,7 @@ static inline int WLAN_FC_IS_QOS_DATA(u1
return (fc & 0x8C) == 0x88;
}
@@ -61452,8 +61472,8 @@
int ieee80211_qdisc_installed(struct net_device *dev);
int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
diff -up linux-2.6.25.noarch/net/mac80211/wpa.c.orig linux-2.6.25.noarch/net/mac80211/wpa.c
---- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-06-24 14:47:34.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-06-24 14:48:48.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-06-25 14:44:53.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-06-25 14:45:47.000000000 -0400
@@ -24,46 +24,22 @@ static int ieee80211_get_hdr_info(const
{
struct ieee80211_hdr *hdr;
@@ -61792,8 +61812,8 @@
if ((rx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA)
return RX_CONTINUE;
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-24 14:47:34.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/core.c 2008-06-24 14:47:54.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-06-25 14:44:53.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/core.c 2008-06-25 14:45:47.000000000 -0400
@@ -143,8 +143,11 @@ void cfg80211_put_dev(struct cfg80211_re
int cfg80211_dev_rename(struct cfg80211_registered_device *rdev,
char *newname)
@@ -61857,8 +61877,8 @@
/* exported functions */
diff -up linux-2.6.25.noarch/net/wireless/radiotap.c.orig linux-2.6.25.noarch/net/wireless/radiotap.c
---- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-06-24 14:47:34.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-06-24 14:47:54.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/radiotap.c.orig 2008-04-16 22:49:44.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-06-25 14:45:47.000000000 -0400
@@ -59,23 +59,21 @@ int ieee80211_radiotap_iterator_init(
return -EINVAL;
@@ -61900,37 +61920,3 @@
} else
/* no more bitmaps: end */
diff -up linux-2.6.25.noarch/net/wireless/reg.c.orig linux-2.6.25.noarch/net/wireless/reg.c
---- linux-2.6.25.noarch/net/wireless/reg.c.orig 2008-06-24 14:42:56.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/reg.c 2008-06-24 14:48:48.000000000 -0400
-@@ -80,6 +80,23 @@ static const struct ieee80211_channel_ra
- IEEE80211_CHAN_RADAR),
- };
-
-+static const struct ieee80211_channel_range ieee80211_EU_channels[] = {
-+ /* IEEE 802.11b/g, channels 1..13 */
-+ RANGE_PWR(2412, 2472, 20, 6, 0),
-+ /* IEEE 802.11a, channel 36*/
-+ RANGE_PWR(5180, 5180, 23, 6, IEEE80211_CHAN_PASSIVE_SCAN),
-+ /* IEEE 802.11a, channel 40*/
-+ RANGE_PWR(5200, 5200, 23, 6, IEEE80211_CHAN_PASSIVE_SCAN),
-+ /* IEEE 802.11a, channel 44*/
-+ RANGE_PWR(5220, 5220, 23, 6, IEEE80211_CHAN_PASSIVE_SCAN),
-+ /* IEEE 802.11a, channels 48..64 */
-+ RANGE_PWR(5240, 5320, 23, 6, IEEE80211_CHAN_NO_IBSS |
-+ IEEE80211_CHAN_RADAR),
-+ /* IEEE 802.11a, channels 100..140 */
-+ RANGE_PWR(5500, 5700, 30, 6, IEEE80211_CHAN_NO_IBSS |
-+ IEEE80211_CHAN_RADAR),
-+};
-+
- #define REGDOM(_code) \
- { \
- .code = __stringify(_code), \
-@@ -90,6 +107,7 @@ static const struct ieee80211_channel_ra
- static const struct ieee80211_regdomain ieee80211_regdoms[] = {
- REGDOM(US),
- REGDOM(JP),
-+ REGDOM(EU),
- };
-
-
linux-2.6-wireless.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.40 -r 1.41 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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- linux-2.6-wireless.patch 14 Jun 2008 00:09:51 -0000 1.40
+++ linux-2.6-wireless.patch 25 Jun 2008 19:29:30 -0000 1.41
@@ -1,3 +1,121 @@
+commit 66b5004d85164a6439d3ba1e7757734472ee2cac
+Author: Ron Rindjunsky <ron.rindjunsky at intel.com>
+Date: Wed Jun 25 16:46:31 2008 +0800
+
+ iwlwifi: improve scanning band selection management
+
+ This patch modifies the band selection management when scanning, so
+ bands are now scanned according to HW band support.
+
+ 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 99ade2597e3f7f0ad463c489aaccd6cc605e242c
+Author: Ivo van Doorn <ivdoorn at gmail.com>
+Date: Fri Jun 20 22:11:00 2008 +0200
+
+ rt2x00: Fix unbalanced mutex locking
+
+ The usb_cache_mutex was not correctly released
+ under all circumstances. Both rt73usb as rt2500usb
+ didn't release the mutex under certain conditions
+ when the register access failed. Obviously such
+ failure would lead to deadlocks.
+
+ In addition under similar circumstances when the
+ bbp register couldn't be read the value must be
+ set to 0xff to indicate that the value is wrong.
+ This too didn't happen under all circumstances.
+
+ Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 2f9ec47d0954f9d2e5a00209c2689cbc477a8c89
+Author: Michael Buesch <mb at bu3sch.de>
+Date: Fri Jun 20 11:40:46 2008 +0200
+
+ b43legacy: Fix possible NULL pointer dereference in DMA code
+
+ This fixes a possible NULL pointer dereference in an error path of the
+ DMA allocation error checking code. This is also necessary for a future
+ DMA API change that is on its way into the mainline kernel that adds
+ an additional dev parameter to dma_mapping_error().
+
+ Signed-off-by: Michael Buesch <mb at bu3sch.de>
+ Cc: stable <stable at kernel.org>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 7b3abfc87ec13a81b255012b6e1bd4caeeb05aec
+Author: Michael Buesch <mb at bu3sch.de>
+Date: Sun Jun 15 16:01:24 2008 +0200
+
+ b43: Fix possible MMIO access while device is down
+
+ This fixes a possible MMIO access while the device is still down
+ from a suspend cycle. MMIO accesses with the device powered down
+ may cause crashes on certain devices.
+
+ Signed-off-by: Michael Buesch <mb at bu3sch.de>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 664f200610a3c9641ff58fc91b986b804cb1cc2d
+Author: Michael Buesch <mb at bu3sch.de>
+Date: Sun Jun 15 15:27:49 2008 +0200
+
+ b43legacy: Do not return TX_BUSY from op_tx
+
+ Never return TX_BUSY from op_tx. It doesn't make sense to return
+ TX_BUSY, if we can not transmit the packet.
+ Drop the packet and return TX_OK.
+
+ Signed-off-by: Michael Buesch <mb at bu3sch.de>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit c9e8eae0935f03e2d03a7ad7af80d8fc6c53e68c
+Author: Michael Buesch <mb at bu3sch.de>
+Date: Sun Jun 15 15:17:29 2008 +0200
+
+ b43: Do not return TX_BUSY from op_tx
+
+ Never return TX_BUSY from op_tx. It doesn't make sense to return
+ TX_BUSY, if we can not transmit the packet.
+ Drop the packet and return TX_OK.
+ This will fix the resume hang.
+
+ Signed-off-by: Michael Buesch <mb at bu3sch.de>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit 59d393ad92f719d9ef36b96eae56d4817a7eeb10
+Author: Tony Vroon <tony at linx.net>
+Date: Wed Jun 11 16:23:56 2008 -0400
+
+ mac80211: implement EU regulatory domain
+
+ Implement missing EU regulatory domain for mac80211. Based on the
+ information in IEEE 802.11-2007 (specifically pages 1142, 1143 & 1148)
+ and ETSI 301 893 (V1.4.1).
+ With thanks to Johannes Berg.
+
+ Signed-off-by: Tony Vroon <tony at linx.net>
+ Acked-by: Johannes Berg <johannes at sipsolutions.net>
+ Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+commit ef3a62d272f033989e83eb1f26505f93f93e3e69
+Author: Johannes Berg <johannes at sipsolutions.net>
+Date: Wed Jun 18 15:39:48 2008 -0700
+
+ mac80211: detect driver tx bugs
+
+ When a driver rejects a frame in it's ->tx() callback, it must also
+ stop queues, otherwise mac80211 can go into a loop here. Detect this
+ situation and abort the loop after five retries, warning about the
+ driver bug.
+
+ Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
+ Signed-off-by: David S. Miller <davem at davemloft.net>
+
commit cb62eccd7d946f7fb92b8beb79988726ec92c227
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Thu Jun 12 20:47:17 2008 +0200
@@ -9010,8 +9128,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-06-13 17:47:27.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-06-13 17:47:52.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig 2008-06-25 14:35:03.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-06-25 14:35:20.000000000 -0400
@@ -48,6 +48,32 @@ static struct pci_device_id adm8211_pci_
{ 0 }
};
@@ -9209,8 +9327,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-06-13 17:47:27.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-06-13 17:47:52.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig 2008-06-25 14:35:03.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-06-25 14:35:20.000000000 -0400
@@ -534,61 +534,6 @@ struct adm8211_eeprom {
u8 cis_data[0]; /* 0x80, 384 bytes */
} __attribute__ ((packed));
@@ -9298,8 +9416,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-06-13 17:47:27.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-06-13 17:47:52.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-06-25 14:35:03.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-06-25 14:35:20.000000000 -0400
@@ -2668,6 +2668,7 @@ static struct net_device *init_wifidev(s
dev->irq = ethdev->irq;
dev->base_addr = ethdev->base_addr;
@@ -9554,8 +9672,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-06-13 17:47:27.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h 2008-06-13 17:47:52.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h.orig 2008-06-25 14:35:03.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/ath5k.h 2008-06-25 14:35:20.000000000 -0400
@@ -30,7 +30,6 @@
#include <net/mac80211.h>
@@ -9905,8 +10023,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-06-13 17:47:27.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-06-13 17:47:52.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-06-25 14:35:03.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-06-25 14:35:20.000000000 -0400
@@ -58,10 +58,6 @@
#include "reg.h"
#include "debug.h"
@@ -10960,8 +11078,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-06-13 17:47:27.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h 2008-06-13 17:47:52.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-06-25 14:35:03.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h 2008-06-25 14:35:20.000000000 -0400
@@ -83,7 +83,7 @@ struct ath5k_txq {
#if CHAN_DEBUG
#define ATH_CHAN_MAX (26+26+26+200+200)
@@ -11007,8 +11125,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
[...7839 lines suppressed...]
sta = tx.sta;
@@ -126495,8 +126912,8 @@
return skb;
}
diff -up linux-2.6.25.noarch/net/mac80211/util.c.orig linux-2.6.25.noarch/net/mac80211/util.c
---- linux-2.6.25.noarch/net/mac80211/util.c.orig 2008-06-13 17:47:28.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/util.c 2008-06-13 17:47:53.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/util.c.orig 2008-06-25 14:35:04.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/util.c 2008-06-25 14:35:21.000000000 -0400
@@ -25,7 +25,8 @@
#include <net/rtnetlink.h>
@@ -126815,8 +127232,8 @@
-EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces);
+EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces_atomic);
diff -up linux-2.6.25.noarch/net/mac80211/wep.c.orig linux-2.6.25.noarch/net/mac80211/wep.c
---- linux-2.6.25.noarch/net/mac80211/wep.c.orig 2008-06-13 17:47:28.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-06-13 17:47:53.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wep.c.orig 2008-06-25 14:35:04.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-06-25 14:35:21.000000000 -0400
@@ -305,39 +305,39 @@ u8 * ieee80211_wep_is_weak_iv(struct sk_
return NULL;
}
@@ -126907,8 +127324,8 @@
+ return TX_CONTINUE;
}
diff -up linux-2.6.25.noarch/net/mac80211/wep.h.orig linux-2.6.25.noarch/net/mac80211/wep.h
---- linux-2.6.25.noarch/net/mac80211/wep.h.orig 2008-06-13 17:47:28.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-06-13 17:47:53.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wep.h.orig 2008-06-25 14:35:04.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-06-25 14:35:21.000000000 -0400
@@ -14,7 +14,7 @@
#include <linux/skbuff.h>
#include <linux/types.h>
@@ -126933,8 +127350,8 @@
#endif /* WEP_H */
diff -up /dev/null linux-2.6.25.noarch/net/mac80211/wext.c
---- /dev/null 2008-06-13 08:28:06.437004730 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-06-13 17:58:44.000000000 -0400
+--- /dev/null 2008-06-25 08:17:03.992002591 -0400
++++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-06-25 14:35:21.000000000 -0400
@@ -0,0 +1,1164 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
@@ -128101,8 +128518,8 @@
+ .get_wireless_stats = ieee80211_get_wireless_stats,
+};
diff -up linux-2.6.25.noarch/net/mac80211/wme.c.orig linux-2.6.25.noarch/net/mac80211/wme.c
---- linux-2.6.25.noarch/net/mac80211/wme.c.orig 2008-06-13 17:47:28.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-06-13 17:58:44.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wme.c.orig 2008-06-25 14:35:04.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-06-25 14:35:21.000000000 -0400
@@ -19,10 +19,13 @@
#include "wme.h"
@@ -128312,8 +128729,8 @@
+ }
+}
diff -up linux-2.6.25.noarch/net/mac80211/wme.h.orig linux-2.6.25.noarch/net/mac80211/wme.h
---- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-06-13 17:47:28.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-06-13 17:47:53.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-06-25 14:35:04.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-06-25 14:35:21.000000000 -0400
@@ -24,6 +24,8 @@
#define QOS_CONTROL_TAG1D_MASK 0x07
@@ -128359,8 +128776,8 @@
{
return 0;
diff -up linux-2.6.25.noarch/net/mac80211/wpa.c.orig linux-2.6.25.noarch/net/mac80211/wpa.c
---- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-06-13 17:47:28.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-06-13 17:47:53.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-06-25 14:35:04.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-06-25 14:35:21.000000000 -0400
@@ -70,8 +70,8 @@ static int ieee80211_get_hdr_info(const
}
@@ -128740,8 +129157,8 @@
+ return RX_CONTINUE;
}
diff -up linux-2.6.25.noarch/net/mac80211/wpa.h.orig linux-2.6.25.noarch/net/mac80211/wpa.h
---- linux-2.6.25.noarch/net/mac80211/wpa.h.orig 2008-06-13 17:47:28.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wpa.h 2008-06-13 17:47:53.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wpa.h.orig 2008-06-25 14:35:04.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wpa.h 2008-06-25 14:35:21.000000000 -0400
@@ -13,19 +13,19 @@
#include <linux/types.h>
#include "ieee80211_i.h"
@@ -128775,8 +129192,8 @@
#endif /* WPA_H */
diff -up linux-2.6.25.noarch/net/wireless/core.c.orig linux-2.6.25.noarch/net/wireless/core.c
---- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-06-13 17:47:28.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/core.c 2008-06-13 17:47:53.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-06-25 14:35:04.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/core.c 2008-06-25 14:35:21.000000000 -0400
@@ -232,6 +232,47 @@ int wiphy_register(struct wiphy *wiphy)
{
struct cfg80211_registered_device *drv = wiphy_to_dev(wiphy);
@@ -128826,8 +129243,8 @@
mutex_lock(&cfg80211_drv_mutex);
diff -up linux-2.6.25.noarch/net/wireless/core.h.orig linux-2.6.25.noarch/net/wireless/core.h
---- linux-2.6.25.noarch/net/wireless/core.h.orig 2008-06-13 17:47:28.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/core.h 2008-06-13 17:47:53.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/core.h.orig 2008-06-25 14:35:04.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/core.h 2008-06-25 14:35:21.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);
@@ -128837,8 +129254,8 @@
+
#endif /* __NET_WIRELESS_CORE_H */
diff -up linux-2.6.25.noarch/net/wireless/Makefile.orig linux-2.6.25.noarch/net/wireless/Makefile
---- linux-2.6.25.noarch/net/wireless/Makefile.orig 2008-06-13 17:47:28.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/Makefile 2008-06-13 17:47:53.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/Makefile.orig 2008-06-25 14:35:04.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/Makefile 2008-06-25 14:35:21.000000000 -0400
@@ -1,5 +1,5 @@
obj-$(CONFIG_WIRELESS_EXT) += wext.o
obj-$(CONFIG_CFG80211) += cfg80211.o
@@ -128847,8 +129264,8 @@
+cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o
cfg80211-$(CONFIG_NL80211) += nl80211.o
diff -up linux-2.6.25.noarch/net/wireless/nl80211.c.orig linux-2.6.25.noarch/net/wireless/nl80211.c
---- linux-2.6.25.noarch/net/wireless/nl80211.c.orig 2008-06-13 17:47:28.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/nl80211.c 2008-06-13 17:47:53.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/nl80211.c.orig 2008-06-25 14:35:04.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/nl80211.c 2008-06-25 14:35:21.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,
@@ -129539,9 +129956,9 @@
/* multicast groups */
diff -up /dev/null linux-2.6.25.noarch/net/wireless/reg.c
---- /dev/null 2008-06-13 08:28:06.437004730 -0400
-+++ linux-2.6.25.noarch/net/wireless/reg.c 2008-06-13 17:47:53.000000000 -0400
-@@ -0,0 +1,162 @@
+--- /dev/null 2008-06-25 08:17:03.992002591 -0400
++++ linux-2.6.25.noarch/net/wireless/reg.c 2008-06-25 14:35:54.000000000 -0400
+@@ -0,0 +1,180 @@
+/*
+ * Copyright 2002-2005, Instant802 Networks, Inc.
+ * Copyright 2005-2006, Devicescape Software, Inc.
@@ -129624,6 +130041,23 @@
+ IEEE80211_CHAN_RADAR),
+};
+
++static const struct ieee80211_channel_range ieee80211_EU_channels[] = {
++ /* IEEE 802.11b/g, channels 1..13 */
++ RANGE_PWR(2412, 2472, 20, 6, 0),
++ /* IEEE 802.11a, channel 36*/
++ RANGE_PWR(5180, 5180, 23, 6, IEEE80211_CHAN_PASSIVE_SCAN),
++ /* IEEE 802.11a, channel 40*/
++ RANGE_PWR(5200, 5200, 23, 6, IEEE80211_CHAN_PASSIVE_SCAN),
++ /* IEEE 802.11a, channel 44*/
++ RANGE_PWR(5220, 5220, 23, 6, IEEE80211_CHAN_PASSIVE_SCAN),
++ /* IEEE 802.11a, channels 48..64 */
++ RANGE_PWR(5240, 5320, 23, 6, IEEE80211_CHAN_NO_IBSS |
++ IEEE80211_CHAN_RADAR),
++ /* IEEE 802.11a, channels 100..140 */
++ RANGE_PWR(5500, 5700, 30, 6, IEEE80211_CHAN_NO_IBSS |
++ IEEE80211_CHAN_RADAR),
++};
++
+#define REGDOM(_code) \
+ { \
+ .code = __stringify(_code), \
@@ -129634,6 +130068,7 @@
+static const struct ieee80211_regdomain ieee80211_regdoms[] = {
+ REGDOM(US),
+ REGDOM(JP),
++ REGDOM(EU),
+};
+
+
@@ -129705,8 +130140,8 @@
+ handle_band(wiphy->bands[band], rd);
+}
diff -up /dev/null linux-2.6.25.noarch/net/wireless/util.c
---- /dev/null 2008-06-13 08:28:06.437004730 -0400
-+++ linux-2.6.25.noarch/net/wireless/util.c 2008-06-13 17:47:53.000000000 -0400
+--- /dev/null 2008-06-25 08:17:03.992002591 -0400
++++ linux-2.6.25.noarch/net/wireless/util.c 2008-06-25 14:35:21.000000000 -0400
@@ -0,0 +1,121 @@
+/*
+ * Wireless utility functions
@@ -129830,8 +130265,8 @@
+ set_mandatory_flags_band(wiphy->bands[band], band);
+}
diff -up linux-2.6.25.noarch/net/wireless/wext.c.orig linux-2.6.25.noarch/net/wireless/wext.c
---- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-06-13 17:47:28.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/wext.c 2008-06-13 17:47:53.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/wext.c.orig 2008-06-25 14:35:04.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/wext.c 2008-06-25 14:35:21.000000000 -0400
@@ -1157,7 +1157,7 @@ static void rtmsg_iwinfo(struct net_devi
struct sk_buff *skb;
int err;
- Previous message (by thread): rpms/swfdec/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 swfdec.spec, 1.12, 1.13
- Next message (by thread): rpms/swfdec-mozilla/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 swfdec-mozilla.spec, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list