rpms/kernel/FC-6 jwltest-mac80211-backport-2_6_19-fixup.patch, 1.1.4.1, 1.1.4.2

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Mar 2 21:22:19 UTC 2007


Author: linville

Update of /cvs/dist/rpms/kernel/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv7986

Modified Files:
      Tag: private-linville-jwltest-fc6-24-branch
	jwltest-mac80211-backport-2_6_19-fixup.patch 
Log Message:


jwltest-mac80211-backport-2_6_19-fixup.patch:
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h      |    2 
 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c |   20 +--
 drivers/net/wireless/mac80211/rt2x00/rt2400pci.c     |   65 +++++------
 drivers/net/wireless/mac80211/rt2x00/rt2400pci.h     |    6 -
 drivers/net/wireless/mac80211/rt2x00/rt2500pci.c     |   65 +++++------
 drivers/net/wireless/mac80211/rt2x00/rt2500pci.h     |    6 -
 drivers/net/wireless/mac80211/rt2x00/rt2500usb.c     |   65 +++++------
 drivers/net/wireless/mac80211/rt2x00/rt2500usb.h     |    6 -
 drivers/net/wireless/mac80211/rt2x00/rt2x00.h        |    8 -
 drivers/net/wireless/mac80211/rt2x00/rt61pci.c       |   65 +++++------
 drivers/net/wireless/mac80211/rt2x00/rt61pci.h       |    6 -
 drivers/net/wireless/mac80211/rt2x00/rt73usb.c       |   65 +++++------
 drivers/net/wireless/mac80211/rt2x00/rt73usb.h       |    6 -
 drivers/net/wireless/mac80211/zd1211rw/zd_mac.c      |   14 +-
 drivers/net/wireless/mac80211/zd1211rw/zd_mac.h      |    2 
 net/mac80211/ieee80211.c                             |    8 -
 net/mac80211/ieee80211_i.h                           |    7 -
 net/mac80211/ieee80211_iface.c                       |    2 
 net/mac80211/ieee80211_sta.c                         |   28 ++---
 net/mac80211/ieee80211_sysfs.c                       |  105 +++++++++----------
 net/mac80211/ieee80211_sysfs_sta.c                   |    2 
 net/mac80211/sta_info.c                              |    7 -
 net/mac80211/wep.c                                   |    1 
 net/mac80211/wme.c                                   |    5 
 net/wireless/core.c                                  |    4 
 net/wireless/nl80211.c                               |    3 
 26 files changed, 257 insertions(+), 316 deletions(-)

Index: jwltest-mac80211-backport-2_6_19-fixup.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/Attic/jwltest-mac80211-backport-2_6_19-fixup.patch,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -r1.1.4.1 -r1.1.4.2
--- jwltest-mac80211-backport-2_6_19-fixup.patch	2 Mar 2007 20:55:32 -0000	1.1.4.1
+++ jwltest-mac80211-backport-2_6_19-fixup.patch	2 Mar 2007 21:22:17 -0000	1.1.4.2
@@ -1,5 +1,5 @@
---- linux-2.6.19.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h.orig	2007-03-02 14:58:57.000000000 -0500
-+++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h	2007-03-02 15:00:06.000000000 -0500
+--- linux-2.6.19.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h.orig	2007-03-02 16:15:56.000000000 -0500
++++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h	2007-03-02 16:16:05.000000000 -0500
 @@ -742,7 +742,7 @@ struct bcm43xx_wldev {
  	struct tasklet_struct isr_tasklet;
  
@@ -9,8 +9,8 @@
  	unsigned int periodic_state;
  
  	struct work_struct restart_work;
---- linux-2.6.19.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c.orig	2007-03-02 14:58:57.000000000 -0500
-+++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c	2007-03-02 15:00:06.000000000 -0500
+--- linux-2.6.19.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c.orig	2007-03-02 16:15:56.000000000 -0500
++++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c	2007-03-02 16:16:05.000000000 -0500
 @@ -2284,10 +2284,9 @@ static int estimate_periodic_work_badnes
  	return badness;
  }
@@ -65,8 +65,8 @@
  
  	bcm43xx_radio_turn_off(dev);
  	bcm43xx_switch_analog(dev, 0);
---- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.h.orig	2007-03-02 14:58:57.000000000 -0500
-+++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.h	2007-03-02 15:00:06.000000000 -0500
+--- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.h.orig	2007-03-02 16:15:56.000000000 -0500
++++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.h	2007-03-02 16:16:05.000000000 -0500
 @@ -1226,9 +1226,9 @@ static void rt2500pci_disable_radio(stru
  /*
   * Interrupt functions.
@@ -80,8 +80,8 @@
  static irqreturn_t rt2500pci_interrupt(int irq, void *dev_instance);
  
  #endif /* RT2500PCI_H */
---- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.c.orig	2007-03-02 14:58:57.000000000 -0500
-+++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.c	2007-03-02 15:00:06.000000000 -0500
+--- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.c.orig	2007-03-02 16:15:56.000000000 -0500
++++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.c	2007-03-02 16:16:05.000000000 -0500
 @@ -724,12 +724,9 @@ static void rt2500usb_config_mac_address
  /*
   * Link tuning
@@ -243,8 +243,8 @@
  
  	/*
  	 * Reset current working type.
---- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00.h.orig	2007-03-02 14:58:57.000000000 -0500
-+++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00.h	2007-03-02 15:00:06.000000000 -0500
+--- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00.h.orig	2007-03-02 16:15:56.000000000 -0500
++++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00.h	2007-03-02 16:16:05.000000000 -0500
 @@ -686,7 +686,7 @@ struct link {
  	/*
  	 * Work structure for scheduling periodic link tuning.
@@ -267,8 +267,8 @@
  	 * Completion structure if an packet needs to be send.
  	 */
  	struct completion completion;
---- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.h.orig	2007-03-02 14:58:57.000000000 -0500
-+++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.h	2007-03-02 15:00:06.000000000 -0500
+--- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.h.orig	2007-03-02 16:15:56.000000000 -0500
++++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.h	2007-03-02 16:16:05.000000000 -0500
 @@ -1390,9 +1390,9 @@ static void rt61pci_disable_radio(struct
  /*
   * Interrupt functions.
@@ -282,8 +282,8 @@
  static irqreturn_t rt61pci_interrupt(int irq, void *dev_instance);
  
  #endif /* RT61PCI_H */
---- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.c.orig	2007-03-02 14:58:57.000000000 -0500
-+++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.c	2007-03-02 15:00:06.000000000 -0500
+--- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.c.orig	2007-03-02 16:15:56.000000000 -0500
++++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.c	2007-03-02 16:16:05.000000000 -0500
 @@ -692,12 +692,9 @@ static void rt2500pci_config_mac_address
  /*
   * Link tuning
@@ -445,8 +445,8 @@
  
  	/*
  	 * Reset current working type.
---- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.h.orig	2007-03-02 14:58:57.000000000 -0500
-+++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.h	2007-03-02 15:00:06.000000000 -0500
+--- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.h.orig	2007-03-02 16:15:56.000000000 -0500
++++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.h	2007-03-02 16:16:05.000000000 -0500
 @@ -731,9 +731,9 @@ static void rt2500usb_disable_radio(stru
  /*
   * Interrupt functions.
@@ -460,8 +460,8 @@
  static void rt2500usb_interrupt(struct urb *urb);
  
  #endif /* RT2500USB_H */
---- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.c.orig	2007-03-02 14:58:57.000000000 -0500
-+++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.c	2007-03-02 15:00:06.000000000 -0500
+--- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.c.orig	2007-03-02 16:15:56.000000000 -0500
++++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.c	2007-03-02 16:16:05.000000000 -0500
 @@ -916,12 +916,9 @@ static void rt61pci_config_mac_address(s
  /*
   * Link tuning
@@ -623,8 +623,8 @@
  
  	/*
  	 * Reset current working type.
---- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.h.orig	2007-03-02 14:58:57.000000000 -0500
-+++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.h	2007-03-02 15:00:06.000000000 -0500
+--- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.h.orig	2007-03-02 16:15:56.000000000 -0500
++++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.h	2007-03-02 16:16:05.000000000 -0500
 @@ -972,9 +972,9 @@ static void rt73usb_disable_radio(struct
  /*
   * Interrupt functions.
@@ -638,8 +638,8 @@
  static void rt73usb_interrupt(struct urb *urb);
  
  #endif /* RT73USB_H */
---- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.h.orig	2007-03-02 14:58:57.000000000 -0500
-+++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.h	2007-03-02 15:00:06.000000000 -0500
+--- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.h.orig	2007-03-02 16:15:56.000000000 -0500
++++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.h	2007-03-02 16:16:05.000000000 -0500
 @@ -959,9 +959,9 @@ static void rt2400pci_disable_radio(stru
  /*
   * Interrupt functions.
@@ -653,8 +653,8 @@
  static irqreturn_t rt2400pci_interrupt(int irq, void *dev_instance);
  
  #endif /* RT2400PCI_H */
---- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.c.orig	2007-03-02 14:58:57.000000000 -0500
-+++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.c	2007-03-02 15:00:06.000000000 -0500
+--- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.c.orig	2007-03-02 16:15:56.000000000 -0500
++++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.c	2007-03-02 16:16:05.000000000 -0500
 @@ -814,12 +814,9 @@ static void rt73usb_config_mac_address(s
  /*
   * Link tuning
@@ -816,8 +816,8 @@
  
  	/*
  	 * Reset current working type.
---- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.c.orig	2007-03-02 14:58:57.000000000 -0500
-+++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.c	2007-03-02 15:00:06.000000000 -0500
+--- linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.c.orig	2007-03-02 16:15:56.000000000 -0500
++++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.c	2007-03-02 16:16:05.000000000 -0500
 @@ -617,12 +617,9 @@ static void rt2400pci_config_mac_address
  /*
   * Link tuning
@@ -983,8 +983,8 @@
  
  	/*
  	 * Reset current working type.
---- linux-2.6.19.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.c.orig	2007-03-02 14:58:57.000000000 -0500
-+++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.c	2007-03-02 15:00:06.000000000 -0500
+--- linux-2.6.19.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.c.orig	2007-03-02 16:15:56.000000000 -0500
++++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.c	2007-03-02 16:16:05.000000000 -0500
 @@ -552,10 +552,9 @@ static int zd_mac_config_interface(struc
  	return 0;
  }
@@ -1029,8 +1029,8 @@
  }
  
  static void housekeeping_enable(struct zd_mac *mac)
---- linux-2.6.19.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.h.orig	2007-03-02 14:58:57.000000000 -0500
-+++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.h	2007-03-02 15:00:06.000000000 -0500
+--- linux-2.6.19.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.h.orig	2007-03-02 16:15:56.000000000 -0500
++++ linux-2.6.19.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.h	2007-03-02 16:16:05.000000000 -0500
 @@ -119,7 +119,7 @@ enum mac_flags {
  };
  
@@ -1040,8 +1040,8 @@
  };
  
  #define ZD_MAC_STATS_BUFFER_SIZE 16
---- linux-2.6.19.noarch/net/wireless/nl80211.c.orig	2007-03-02 14:58:57.000000000 -0500
-+++ linux-2.6.19.noarch/net/wireless/nl80211.c	2007-03-02 15:00:06.000000000 -0500
+--- linux-2.6.19.noarch/net/wireless/nl80211.c.orig	2007-03-02 16:15:56.000000000 -0500
++++ linux-2.6.19.noarch/net/wireless/nl80211.c	2007-03-02 16:16:05.000000000 -0500
 @@ -1002,7 +1002,8 @@ static struct genl_ops nl80211_ops[] = {
  void *nl80211hdr_put(struct sk_buff *skb, u32 pid, u32 seq, int flags, u8 cmd)
  {
@@ -1052,8 +1052,28 @@
  }
  EXPORT_SYMBOL_GPL(nl80211hdr_put);
  
---- linux-2.6.19.noarch/net/mac80211/wme.c.orig	2007-03-02 14:58:57.000000000 -0500
-+++ linux-2.6.19.noarch/net/mac80211/wme.c	2007-03-02 15:00:06.000000000 -0500
+--- linux-2.6.19.noarch/net/wireless/core.c.orig	2007-03-02 16:21:41.000000000 -0500
++++ linux-2.6.19.noarch/net/wireless/core.c	2007-03-02 16:18:49.000000000 -0500
+@@ -255,7 +255,7 @@ static int cfg80211_netdev_notifier_call
+ 	case NETDEV_REGISTER:
+ 		mutex_lock(&rdev->devlist_mtx);
+ 		list_add(&dev->ieee80211_ptr->list, &rdev->netdev_list);
+-		if (sysfs_create_link(&dev->dev.kobj, &rdev->wiphy.dev.kobj,
++		if (sysfs_create_link(&dev->class_dev.kobj, &rdev->wiphy.dev.kobj,
+ 				      "phy80211")) {
+ 			printk(KERN_ERR "wireless: failed to add phy80211 symlink to netdev!\n");
+ 		}
+@@ -264,7 +264,7 @@ static int cfg80211_netdev_notifier_call
+ 		break;
+ 	case NETDEV_UNREGISTER:
+ 		mutex_lock(&rdev->devlist_mtx);
+-		sysfs_remove_link(&dev->dev.kobj, "phy80211");
++		sysfs_remove_link(&dev->class_dev.kobj, "phy80211");
+ 		list_del(&dev->ieee80211_ptr->list);
+ 		mutex_unlock(&rdev->devlist_mtx);
+ 		break;
+--- linux-2.6.19.noarch/net/mac80211/wme.c.orig	2007-03-02 16:15:56.000000000 -0500
++++ linux-2.6.19.noarch/net/mac80211/wme.c	2007-03-02 16:16:05.000000000 -0500
 @@ -417,8 +417,7 @@ static int wme_qdiscop_init(struct Qdisc
  	/* create child queues */
  	for (i = 0; i < queues; i++) {
@@ -1073,8 +1093,8 @@
  	if (!qdisc) {
  		printk(KERN_ERR "%s: qdisc installation failed\n", dev->name);
  		return;
---- linux-2.6.19.noarch/net/mac80211/ieee80211_i.h.orig	2007-03-02 14:58:57.000000000 -0500
-+++ linux-2.6.19.noarch/net/mac80211/ieee80211_i.h	2007-03-02 15:00:06.000000000 -0500
+--- linux-2.6.19.noarch/net/mac80211/ieee80211_i.h.orig	2007-03-02 16:15:56.000000000 -0500
++++ linux-2.6.19.noarch/net/mac80211/ieee80211_i.h	2007-03-02 16:16:05.000000000 -0500
 @@ -443,8 +443,7 @@ struct ieee80211_local {
  	int scan_channel_idx;
  	enum { SCAN_SET_CHANNEL, SCAN_SEND_PROBE } scan_state;
@@ -1096,8 +1116,8 @@
  void ieee80211_sta_rx_mgmt(struct net_device *dev, struct sk_buff *skb,
  			   struct ieee80211_rx_status *rx_status);
  int ieee80211_sta_set_ssid(struct net_device *dev, char *ssid, size_t len);
---- linux-2.6.19.noarch/net/mac80211/ieee80211_sysfs.c.orig	2007-03-02 14:58:57.000000000 -0500
-+++ linux-2.6.19.noarch/net/mac80211/ieee80211_sysfs.c	2007-03-02 15:05:19.000000000 -0500
+--- linux-2.6.19.noarch/net/mac80211/ieee80211_sysfs.c.orig	2007-03-02 16:15:56.000000000 -0500
++++ linux-2.6.19.noarch/net/mac80211/ieee80211_sysfs.c	2007-03-02 16:16:05.000000000 -0500
 @@ -24,6 +24,9 @@ static inline struct ieee80211_local *to
  	return wiphy_priv(wiphy);
  }
@@ -1271,8 +1291,8 @@
 -	ieee80211_remove_if_group(&dev->dev.kobj, dev);
 +	ieee80211_remove_if_group(&dev->class_dev.kobj, dev);
  }
---- linux-2.6.19.noarch/net/mac80211/ieee80211_iface.c.orig	2007-03-02 14:58:57.000000000 -0500
-+++ linux-2.6.19.noarch/net/mac80211/ieee80211_iface.c	2007-03-02 15:00:06.000000000 -0500
+--- linux-2.6.19.noarch/net/mac80211/ieee80211_iface.c.orig	2007-03-02 16:15:56.000000000 -0500
++++ linux-2.6.19.noarch/net/mac80211/ieee80211_iface.c	2007-03-02 16:16:05.000000000 -0500
 @@ -181,7 +181,7 @@ void ieee80211_if_set_type(struct net_de
  		struct ieee80211_if_sta *ifsta;
  
@@ -1282,8 +1302,8 @@
  		setup_timer(&ifsta->timer, ieee80211_sta_timer,
  			    (unsigned long) ifsta);
  		skb_queue_head_init(&ifsta->skb_queue);
---- linux-2.6.19.noarch/net/mac80211/ieee80211_sysfs_sta.c.orig	2007-03-02 14:58:57.000000000 -0500
-+++ linux-2.6.19.noarch/net/mac80211/ieee80211_sysfs_sta.c	2007-03-02 15:00:06.000000000 -0500
+--- linux-2.6.19.noarch/net/mac80211/ieee80211_sysfs_sta.c.orig	2007-03-02 16:15:56.000000000 -0500
++++ linux-2.6.19.noarch/net/mac80211/ieee80211_sysfs_sta.c	2007-03-02 16:16:05.000000000 -0500
 @@ -387,7 +387,7 @@ int ieee80211_key_kset_sysfs_register(st
  	res = kobject_set_name(&sdata->key_kset.kobj, "keys");
  	if (res)
@@ -1293,8 +1313,8 @@
  	sdata->key_kset.ktype = &key_ktype;
  	return kset_register(&sdata->key_kset);
  }
---- linux-2.6.19.noarch/net/mac80211/sta_info.c.orig	2007-03-02 14:58:57.000000000 -0500
-+++ linux-2.6.19.noarch/net/mac80211/sta_info.c	2007-03-02 15:00:06.000000000 -0500
+--- linux-2.6.19.noarch/net/mac80211/sta_info.c.orig	2007-03-02 16:15:56.000000000 -0500
++++ linux-2.6.19.noarch/net/mac80211/sta_info.c	2007-03-02 16:16:05.000000000 -0500
 @@ -342,10 +342,9 @@ static void sta_info_cleanup(unsigned lo
  }
  
@@ -1317,8 +1337,8 @@
  }
  
  int sta_info_start(struct ieee80211_local *local)
---- linux-2.6.19.noarch/net/mac80211/wep.c.orig	2007-03-02 14:58:57.000000000 -0500
-+++ linux-2.6.19.noarch/net/mac80211/wep.c	2007-03-02 15:00:06.000000000 -0500
+--- linux-2.6.19.noarch/net/mac80211/wep.c.orig	2007-03-02 16:15:56.000000000 -0500
++++ linux-2.6.19.noarch/net/mac80211/wep.c	2007-03-02 16:16:05.000000000 -0500
 @@ -15,7 +15,6 @@
  #include <linux/crc32.h>
  #include <linux/crypto.h>
@@ -1327,8 +1347,8 @@
  #include <asm/scatterlist.h>
  
  #include <net/mac80211.h>
---- linux-2.6.19.noarch/net/mac80211/ieee80211.c.orig	2007-03-02 14:58:57.000000000 -0500
-+++ linux-2.6.19.noarch/net/mac80211/ieee80211.c	2007-03-02 15:00:06.000000000 -0500
+--- linux-2.6.19.noarch/net/mac80211/ieee80211.c.orig	2007-03-02 16:15:56.000000000 -0500
++++ linux-2.6.19.noarch/net/mac80211/ieee80211.c	2007-03-02 16:16:05.000000000 -0500
 @@ -2199,13 +2199,13 @@ void ieee80211_if_shutdown(struct net_de
  		flush_scheduled_work();
  		skb_queue_purge(&sdata->u.sta.skb_queue);
@@ -1363,8 +1383,8 @@
  		local->sta_scanning = 0;
  		cancel_delayed_work(&local->scan_work);
  		flush_scheduled_work();
---- linux-2.6.19.noarch/net/mac80211/ieee80211_sta.c.orig	2007-03-02 14:58:57.000000000 -0500
-+++ linux-2.6.19.noarch/net/mac80211/ieee80211_sta.c	2007-03-02 15:00:06.000000000 -0500
+--- linux-2.6.19.noarch/net/mac80211/ieee80211_sta.c.orig	2007-03-02 16:15:56.000000000 -0500
++++ linux-2.6.19.noarch/net/mac80211/ieee80211_sta.c	2007-03-02 16:16:05.000000000 -0500
 @@ -1898,11 +1898,10 @@ void ieee80211_sta_timer(unsigned long d
  }
  




More information about the fedora-cvs-commits mailing list