rpms/kernel/devel kernel.spec, 1.710, 1.711 linux-2.6-wireless-pending.patch, 1.53, 1.54
John W. Linville (linville)
fedora-extras-commits at redhat.com
Tue Jun 24 16:28:18 UTC 2008
Author: linville
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13384
Modified Files:
kernel.spec linux-2.6-wireless-pending.patch
Log Message:
Restore wireless patches disabled during recent updates
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.710
retrieving revision 1.711
diff -u -r1.710 -r1.711
--- kernel.spec 24 Jun 2008 14:54:36 -0000 1.710
+++ kernel.spec 24 Jun 2008 16:25:48 -0000 1.711
@@ -1141,10 +1141,10 @@
# wireless patches headed for 2.6.26
#ApplyPatch linux-2.6-wireless.patch
# wireless patches headed for 2.6.27
-#ApplyPatch linux-2.6-wireless-pending.patch
+ApplyPatch linux-2.6-wireless-pending.patch
# Add misc wireless bits from upstream wireless tree
-#ApplyPatch linux-2.6-at76.patch
+ApplyPatch linux-2.6-at76.patch
# implement smarter atime updates support.
#ApplyPatch linux-2.6-smarter-relatime.patch
@@ -1784,6 +1784,9 @@
%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
%changelog
+* Tue Jun 24 2008 John W. Linville <linville at redhat.com>
+- Restore wireless patches disabled during recent updates
+
* Tue Jun 24 2008 Dave Jones <davej at redhat.com>
- Disable the RCU linked list debug routines for now.
linux-2.6-wireless-pending.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.53 -r 1.54 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.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- linux-2.6-wireless-pending.patch 13 Jun 2008 23:54:08 -0000 1.53
+++ linux-2.6-wireless-pending.patch 24 Jun 2008 16:25:48 -0000 1.54
@@ -3753,8 +3753,8 @@
Signed-off-by: John W. Linville <linville at tuxdriver.com>
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-13 17:32:34.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/Kconfig 2008-06-13 19:28:52.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/Kconfig.orig 2008-06-24 11:07:06.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/Kconfig 2008-06-24 11:44:07.000000000 -0400
@@ -2283,6 +2283,19 @@ config GELIC_WIRELESS
the driver automatically distinguishes the models, you can
safely enable this option even if you have a wireless-less model.
@@ -3776,8 +3776,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-13 17:32:43.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/ps3_gelic_net.c 2008-06-13 19:28:52.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/ps3_gelic_net.c.orig 2008-06-24 11:07:06.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/ps3_gelic_net.c 2008-06-24 11:44:07.000000000 -0400
@@ -110,7 +110,7 @@ static void gelic_card_get_ether_port_st
void gelic_card_up(struct gelic_card *card)
{
@@ -3824,8 +3824,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-13 17:32:43.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/ps3_gelic_net.h 2008-06-13 19:28:52.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/ps3_gelic_net.h.orig 2008-06-24 11:07:06.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/ps3_gelic_net.h 2008-06-24 11:44:07.000000000 -0400
@@ -298,7 +298,7 @@ struct gelic_card {
wait_queue_head_t waitq;
@@ -3836,8 +3836,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-13 17:32:43.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.c 2008-06-13 19:28:52.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.c.orig 2008-06-24 11:07:06.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.c 2008-06-24 11:44:07.000000000 -0400
@@ -45,7 +45,8 @@
#include "ps3_gelic_wireless.h"
@@ -4381,7 +4381,7 @@
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-04-16 22:49:44.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.h 2008-06-13 19:28:52.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/ps3_gelic_wireless.h 2008-06-24 11:44:07.000000000 -0400
@@ -241,7 +241,7 @@ enum gelic_wl_assoc_state {
#define GELIC_WEP_KEYS 4
struct gelic_wl_info {
@@ -4411,8 +4411,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-13 17:32:49.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-06-13 19:28:52.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.c.orig 2008-06-24 11:07:06.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.c 2008-06-24 11:44:07.000000000 -0400
@@ -306,11 +306,10 @@ static int adm8211_get_tx_stats(struct i
struct ieee80211_tx_queue_stats *stats)
{
@@ -4561,8 +4561,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-13 17:32:49.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-06-13 19:28:52.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/adm8211.h.orig 2008-06-24 11:07:06.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/adm8211.h 2008-06-24 11:44:07.000000000 -0400
@@ -443,7 +443,6 @@ struct adm8211_rx_ring_info {
struct adm8211_tx_ring_info {
struct sk_buff *skb;
@@ -4572,8 +4572,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-13 17:32:50.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-06-13 19:28:52.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/airo.c.orig 2008-06-24 11:07:06.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/airo.c 2008-06-24 11:44:07.000000000 -0400
@@ -1148,7 +1148,6 @@ static u8 airo_dbm_to_pct (tdsRssiEntry
static void airo_networks_free(struct airo_info *ai);
@@ -4743,7 +4743,7 @@
buffer = (u16*)skb_put (skb, len + hdrlen);
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-04-16 22:49:44.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/arlan.h 2008-06-13 19:28:52.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/arlan.h 2008-06-24 11:44:07.000000000 -0400
@@ -330,7 +330,6 @@ struct TxParam
#define TX_RING_SIZE 2
/* Information that need to be kept for each board. */
@@ -4754,7 +4754,7 @@
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-04-16 22:49:44.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/arlan-main.c 2008-06-13 19:28:52.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/arlan-main.c 2008-06-24 11:44:07.000000000 -0400
@@ -125,7 +125,7 @@ static inline int arlan_drop_tx(struct n
{
struct arlan_private *priv = netdev_priv(dev);
@@ -4839,8 +4839,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-13 17:32:50.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-06-13 19:28:52.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c.orig 2008-06-24 11:07:06.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.c 2008-06-24 11:44:07.000000000 -0400
@@ -167,8 +167,7 @@ static struct pci_driver ath5k_pci_drive
/*
* Prototypes - MAC 802.11 stack related functions
@@ -5130,8 +5130,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-13 17:32:50.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h 2008-06-13 19:28:52.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h.orig 2008-06-24 11:07:06.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/ath5k/base.h 2008-06-24 11:44:07.000000000 -0400
@@ -60,7 +60,6 @@ struct ath5k_buf {
dma_addr_t daddr; /* physical addr of desc */
struct sk_buff *skb; /* skbuff for buf */
@@ -5151,8 +5151,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-13 17:32:50.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/atmel.c 2008-06-13 19:28:52.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/atmel.c.orig 2008-06-24 11:07:06.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/atmel.c 2008-06-24 11:44:07.000000000 -0400
@@ -433,7 +433,6 @@ struct atmel_private {
struct net_device *dev;
struct device *sys_dev;
@@ -5332,8 +5332,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-13 19:28:20.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h 2008-06-13 19:28:52.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h.orig 2008-06-24 11:07:06.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/b43/b43.h 2008-06-24 11:44:07.000000000 -0400
@@ -410,8 +410,7 @@ enum {
#define B43_IRQ_TIMEOUT 0x80000000
@@ -5418,7 +5418,7 @@
/* 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-04-16 22:49:44.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/b43/debugfs.c 2008-06-13 19:28:52.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/b43/debugfs.c 2008-06-24 11:44:07.000000000 -0400
@@ -270,24 +270,22 @@ static int restart_write_file(struct b43
return err;
}
@@ -5545,7 +5545,7 @@
}
diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/debugfs.h.orig linux-2.6.25.noarch/drivers/net/wireless/b43/debugfs.h
--- linux-2.6.25.noarch/drivers/net/wireless/b43/debugfs.h.orig 2008-04-16 22:49:44.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/b43/debugfs.h 2008-06-13 19:28:52.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/b43/debugfs.h 2008-06-24 11:44:07.000000000 -0400
@@ -10,6 +10,7 @@ enum b43_dyndbg { /* Dynamic debugging
B43_DBG_DMAVERBOSE,
B43_DBG_PWORK_FAST,
@@ -5555,8 +5555,8 @@
};
diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/dma.c.orig linux-2.6.25.noarch/drivers/net/wireless/b43/dma.c
---- linux-2.6.25.noarch/drivers/net/wireless/b43/dma.c.orig 2008-06-13 19:28:20.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/b43/dma.c 2008-06-13 19:28:52.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/b43/dma.c.orig 2008-06-24 11:07:06.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/b43/dma.c 2008-06-24 11:44:07.000000000 -0400
@@ -1130,10 +1130,10 @@ struct b43_dmaring *parse_cookie(struct
}
@@ -5707,8 +5707,8 @@
}
}
diff -up linux-2.6.25.noarch/drivers/net/wireless/b43/dma.h.orig linux-2.6.25.noarch/drivers/net/wireless/b43/dma.h
---- linux-2.6.25.noarch/drivers/net/wireless/b43/dma.h.orig 2008-06-13 17:32:50.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/net/wireless/b43/dma.h 2008-06-13 19:28:52.000000000 -0400
+--- linux-2.6.25.noarch/drivers/net/wireless/b43/dma.h.orig 2008-06-24 11:07:06.000000000 -0400
++++ linux-2.6.25.noarch/drivers/net/wireless/b43/dma.h 2008-06-24 11:44:07.000000000 -0400
@@ -181,7 +181,6 @@ struct b43_dmadesc_meta {
dma_addr_t dmaaddr;
/* ieee80211 TX status. Only used once per 802.11 frag. */
@@ -5727,8 +5727,8 @@
const struct b43_txstatus *status);
diff -up linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h.orig linux-2.6.25.noarch/drivers/net/wireless/b43legacy/b43legacy.h
[...1805 lines suppressed...]
+@@ -1647,46 +1642,55 @@ int ieee80211_subif_start_xmit(struct sk
return ret;
}
@@ -53208,7 +53213,7 @@
tx.flags = 0;
if (store->last_frag_rate_ctrl_probe)
tx.flags |= IEEE80211_TX_PROBE_LAST_FRAG;
-@@ -1688,19 +1692,11 @@ void ieee80211_tx_pending(unsigned long
+@@ -1695,19 +1699,11 @@ void ieee80211_tx_pending(unsigned long
if (ret == IEEE80211_TX_FRAG_AGAIN)
store->skb = NULL;
} else {
@@ -53230,7 +53235,7 @@
}
/* functions for drivers to get certain frames */
-@@ -1769,11 +1765,11 @@ static void ieee80211_beacon_add_tim(str
+@@ -1776,11 +1772,11 @@ static void ieee80211_beacon_add_tim(str
}
struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw,
@@ -53244,7 +53249,7 @@
struct net_device *bdev;
struct ieee80211_sub_if_data *sdata = NULL;
struct ieee80211_if_ap *ap = NULL;
-@@ -1783,9 +1779,10 @@ struct sk_buff *ieee80211_beacon_get(str
+@@ -1790,9 +1786,10 @@ struct sk_buff *ieee80211_beacon_get(str
struct ieee80211_mgmt *mgmt;
int *num_beacons;
bool err = true;
@@ -53256,7 +53261,7 @@
rcu_read_lock();
-@@ -1878,30 +1875,32 @@ struct sk_buff *ieee80211_beacon_get(str
+@@ -1885,30 +1882,32 @@ struct sk_buff *ieee80211_beacon_get(str
goto out;
}
@@ -53311,7 +53316,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,
@@ -53320,7 +53325,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,
@@ -53329,7 +53334,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,
@@ -53343,7 +53348,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;
@@ -53356,7 +53361,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);
@@ -53381,7 +53386,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);
}
@@ -53410,7 +53415,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;
}
@@ -53419,8 +53424,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:34:23.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/util.c 2008-06-13 19:28:53.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/util.c.orig 2008-06-24 11:07:09.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/util.c 2008-06-24 11:44:08.000000000 -0400
@@ -258,7 +258,7 @@ EXPORT_SYMBOL(ieee80211_generic_frame_du
__le16 ieee80211_rts_duration(struct ieee80211_hw *hw,
@@ -53551,8 +53556,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-13 17:34:23.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-06-13 19:28:53.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wep.c.orig 2008-06-24 11:07:09.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wep.c 2008-06-24 11:44:08.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);
@@ -53598,8 +53603,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-13 17:34:23.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-06-13 19:28:53.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wep.h.orig 2008-06-24 11:07:09.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wep.h 2008-06-24 11:44:08.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,
@@ -53610,8 +53615,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-13 19:28:20.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-06-13 19:28:53.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wext.c.orig 2008-06-24 11:07:09.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wext.c 2008-06-24 11:44:08.000000000 -0400
@@ -169,14 +169,26 @@ static int ieee80211_ioctl_giwrange(stru
range->num_encoding_sizes = 2;
range->max_encoding_tokens = NUM_DEFAULT_KEYS;
@@ -53657,8 +53662,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-13 19:28:20.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-06-13 19:28:53.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wme.c.orig 2008-06-24 11:07:09.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wme.c 2008-06-24 11:44:08.000000000 -0400
@@ -19,16 +19,22 @@
#include "wme.h"
@@ -54033,8 +54038,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-13 17:34:23.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-06-13 19:28:53.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wme.h.orig 2008-06-24 11:07:09.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wme.h 2008-06-24 11:44:08.000000000 -0400
@@ -31,7 +31,7 @@ static inline int WLAN_FC_IS_QOS_DATA(u1
return (fc & 0x8C) == 0x88;
}
@@ -54045,8 +54050,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-13 17:34:23.000000000 -0400
-+++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-06-13 19:28:53.000000000 -0400
+--- linux-2.6.25.noarch/net/mac80211/wpa.c.orig 2008-06-24 11:07:09.000000000 -0400
++++ linux-2.6.25.noarch/net/mac80211/wpa.c 2008-06-24 11:44:08.000000000 -0400
@@ -79,6 +79,7 @@ ieee80211_tx_h_michael_mic_add(struct ie
struct sk_buff *skb = tx->skb;
int authenticator;
@@ -54292,8 +54297,8 @@
}
}
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:34:26.000000000 -0400
-+++ linux-2.6.25.noarch/net/wireless/core.c 2008-06-13 19:28:53.000000000 -0400
+--- linux-2.6.25.noarch/net/wireless/core.c.orig 2008-06-24 11:07:09.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/core.c 2008-06-24 11:44:08.000000000 -0400
@@ -143,8 +143,11 @@ void cfg80211_put_dev(struct cfg80211_re
int cfg80211_dev_rename(struct cfg80211_registered_device *rdev,
char *newname)
@@ -54358,7 +54363,7 @@
/* 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-13 19:28:53.000000000 -0400
++++ linux-2.6.25.noarch/net/wireless/radiotap.c 2008-06-24 11:44:08.000000000 -0400
@@ -59,23 +59,21 @@ int ieee80211_radiotap_iterator_init(
return -EINVAL;
More information about the fedora-extras-commits
mailing list