r28 - in unstable/rt2x00/debian: . patches

[benh at alioth.debian.org]

Author: benh
Date: 2007-10-04 23:17:46 +0000 (Thu, 04 Oct 2007)
New Revision: 28

Modified:
   unstable/rt2x00/debian/changelog
   unstable/rt2x00/debian/patches/003_workaround_2.6.22.diff
Log:
Added (restored) hardware flags needed under Linux 2.6.22.


Modified: unstable/rt2x00/debian/changelog
===================================================================
--- unstable/rt2x00/debian/changelog	2007-09-30 23:25:37 UTC (rev 27)
+++ unstable/rt2x00/debian/changelog	2007-10-04 23:17:46 UTC (rev 28)
@@ -1,3 +1,9 @@
+rt2x00 (2.0.8+git20070918-2) unstable; urgency=low
+
+  * Added hardware flags needed under Linux 2.6.22 (closes: bug#444771)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sun, 30 Sep 2007 21:39:29 +0100
+
 rt2x00 (2.0.8+git20070918-1) unstable; urgency=low
 
   * New version from git (closes: bug#421747, bug#422685)

Modified: unstable/rt2x00/debian/patches/003_workaround_2.6.22.diff
===================================================================
--- unstable/rt2x00/debian/patches/003_workaround_2.6.22.diff	2007-09-30 23:25:37 UTC (rev 27)
+++ unstable/rt2x00/debian/patches/003_workaround_2.6.22.diff	2007-10-04 23:17:46 UTC (rev 28)
@@ -21,3 +21,75 @@
 +#endif
 +
  #endif /* RT2X00_H */
+--- rt2x00.orig/drivers/net/wireless/rt2x00/rt2400pci.c
++++ rt2x00/drivers/net/wireless/rt2x00/rt2400pci.c
+@@ -1459,6 +1459,12 @@
+ 	 * Initialize all hw fields.
+ 	 */
+ 	rt2x00dev->hw->flags =
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
++	    IEEE80211_HW_HOST_GEN_BEACON |
++	    IEEE80211_HW_WEP_INCLUDE_IV |
++	    IEEE80211_HW_DATA_NULLFUNC_ACK |
++	    IEEE80211_HW_NO_TKIP_WMM_HWACCEL |
++#endif
+ 	    IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
+ 	    IEEE80211_HW_MONITOR_DURING_OPER |
+ 	    IEEE80211_HW_NO_PROBE_FILTERING;
+--- rt2x00.orig/drivers/net/wireless/rt2x00/rt2500pci.c
++++ rt2x00/drivers/net/wireless/rt2x00/rt2500pci.c
+@@ -1777,6 +1777,12 @@
+ 	 * Initialize all hw fields.
+ 	 */
+ 	rt2x00dev->hw->flags =
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
++	    IEEE80211_HW_HOST_GEN_BEACON |
++	    IEEE80211_HW_WEP_INCLUDE_IV |
++	    IEEE80211_HW_DATA_NULLFUNC_ACK |
++	    IEEE80211_HW_NO_TKIP_WMM_HWACCEL |
++#endif
+ 	    IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
+ 	    IEEE80211_HW_MONITOR_DURING_OPER |
+ 	    IEEE80211_HW_NO_PROBE_FILTERING;
+--- rt2x00.orig/drivers/net/wireless/rt2x00/rt2500usb.c
++++ rt2x00/drivers/net/wireless/rt2x00/rt2500usb.c
+@@ -1545,6 +1545,11 @@
+ 	 * Initialize all hw fields.
+ 	 */
+ 	rt2x00dev->hw->flags =
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
++	    IEEE80211_HW_WEP_INCLUDE_IV |
++	    IEEE80211_HW_DATA_NULLFUNC_ACK |
++	    IEEE80211_HW_NO_TKIP_WMM_HWACCEL |
++#endif
+ 	    IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE |
+ 	    IEEE80211_HW_RX_INCLUDES_FCS |
+ 	    IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
+--- rt2x00.orig/drivers/net/wireless/rt2x00/rt61pci.c
++++ rt2x00/drivers/net/wireless/rt2x00/rt61pci.c
+@@ -2337,6 +2337,11 @@
+ 	 * Initialize all hw fields.
+ 	 */
+ 	rt2x00dev->hw->flags =
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
++	    IEEE80211_HW_WEP_INCLUDE_IV |
++	    IEEE80211_HW_DATA_NULLFUNC_ACK |
++	    IEEE80211_HW_NO_TKIP_WMM_HWACCEL |
++#endif
+ 	    IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE |
+ 	    IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
+ 	    IEEE80211_HW_MONITOR_DURING_OPER |
+--- rt2x00.orig/drivers/net/wireless/rt2x00/rt73usb.c
++++ rt2x00/drivers/net/wireless/rt2x00/rt73usb.c
+@@ -1799,6 +1799,11 @@
+ 	 * Initialize all hw fields.
+ 	 */
+ 	rt2x00dev->hw->flags =
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
++	    IEEE80211_HW_WEP_INCLUDE_IV |
++	    IEEE80211_HW_DATA_NULLFUNC_ACK |
++	    IEEE80211_HW_NO_TKIP_WMM_HWACCEL |
++#endif
+ 	    IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE |
+ 	    IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
+ 	    IEEE80211_HW_MONITOR_DURING_OPER |