r29 - in unstable/rt2x00/debian: . patches
benh at alioth.debian.org
benh at alioth.debian.org
Sat Oct 6 15:20:18 UTC 2007
Author: benh
Date: 2007-10-06 15:20:18 +0000 (Sat, 06 Oct 2007)
New Revision: 29
Added:
unstable/rt2x00/debian/patches/003_workaround_mac80211_changes.diff
Removed:
unstable/rt2x00/debian/patches/003_workaround_2.6.22.diff
Modified:
unstable/rt2x00/debian/changelog
unstable/rt2x00/debian/patches/series
Log:
Since the mac80211 changes haven't gone into 2.6.23, test feature macros rather than the kernel version.
Modified: unstable/rt2x00/debian/changelog
===================================================================
--- unstable/rt2x00/debian/changelog 2007-10-04 23:17:46 UTC (rev 28)
+++ unstable/rt2x00/debian/changelog 2007-10-06 15:20:18 UTC (rev 29)
@@ -1,8 +1,8 @@
rt2x00 (2.0.8+git20070918-2) unstable; urgency=low
- * Added hardware flags needed under Linux 2.6.22 (closes: bug#444771)
+ * Added hardware flags needed in mainline kernels (closes: bug#444771)
- -- Ben Hutchings <ben at decadent.org.uk> Sun, 30 Sep 2007 21:39:29 +0100
+ -- Ben Hutchings <ben at decadent.org.uk> Sat, 6 Oct 2007 16:19:28 +0100
rt2x00 (2.0.8+git20070918-1) unstable; urgency=low
Deleted: unstable/rt2x00/debian/patches/003_workaround_2.6.22.diff
===================================================================
--- unstable/rt2x00/debian/patches/003_workaround_2.6.22.diff 2007-10-04 23:17:46 UTC (rev 28)
+++ unstable/rt2x00/debian/patches/003_workaround_2.6.22.diff 2007-10-06 15:20:18 UTC (rev 29)
@@ -1,95 +0,0 @@
---- rt2x00.orig/drivers/net/wireless/rt2x00/rt2x00.h
-+++ rt2x00/drivers/net/wireless/rt2x00/rt2x00.h
-@@ -31,6 +31,7 @@
- #include <linux/skbuff.h>
- #include <linux/workqueue.h>
- #include <linux/firmware.h>
-+#include <linux/version.h>
-
- #include <net/mac80211.h>
-
-@@ -806,4 +807,12 @@
- int rt2x00lib_resume(struct rt2x00_dev *rt2x00dev);
- #endif /* CONFIG_PM */
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
-+#define ieee80211_rts_get(hw, if_id, frame, frame_len, frame_txctl, rts) \
-+ ieee80211_rts_get(hw, frame, frame_len, frame_txctl, rts)
-+#define ieee80211_ctstoself_get(hw, if_id, frame, frame_len, frame_txctl, cts) \
-+ ieee80211_ctstoself_get(hw, frame, frame_len, frame_txctl, cts)
-+#define IEEE80211_TXCTL_LONG_RETRY_LIMIT 0
-+#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 |
Copied: unstable/rt2x00/debian/patches/003_workaround_mac80211_changes.diff (from rev 28, unstable/rt2x00/debian/patches/003_workaround_2.6.22.diff)
===================================================================
--- unstable/rt2x00/debian/patches/003_workaround_mac80211_changes.diff (rev 0)
+++ unstable/rt2x00/debian/patches/003_workaround_mac80211_changes.diff 2007-10-06 15:20:18 UTC (rev 29)
@@ -0,0 +1,95 @@
+--- rt2x00.orig/drivers/net/wireless/rt2x00/rt2x00.h
++++ rt2x00/drivers/net/wireless/rt2x00/rt2x00.h
+@@ -806,4 +807,30 @@
+ int rt2x00lib_resume(struct rt2x00_dev *rt2x00dev);
+ #endif /* CONFIG_PM */
+
++#ifndef IEEE80211_TXCTL_LONG_RETRY_LIMIT
++#define IEEE80211_TXCTL_LONG_RETRY_LIMIT 0
++/* These were changed around the same time as
++ * IEEE80211_TXCTL_LONG_RETRY_LIMIT was added in wireless-dev, but we
++ * can't detect this change directly using the preprocessor
++ */
++#define ieee80211_rts_get(hw, if_id, frame, frame_len, frame_txctl, rts) \
++ ieee80211_rts_get(hw, frame, frame_len, frame_txctl, rts)
++#define ieee80211_ctstoself_get(hw, if_id, frame, frame_len, frame_txctl, cts) \
++ ieee80211_ctstoself_get(hw, frame, frame_len, frame_txctl, cts)
++#endif
++
++/* These negative capability flags have been removed in wireless-dev */
++#ifndef IEEE80211_HW_HOST_GEN_BEACON
++#define IEEE80211_HW_HOST_GEN_BEACON 0
++#endif
++#ifndef IEEE80211_HW_WEP_INCLUDE_IV
++#define IEEE80211_HW_WEP_INCLUDE_IV 0
++#endif
++#ifndef IEEE80211_HW_DATA_NULLFUNC_ACK
++#define IEEE80211_HW_DATA_NULLFUNC_ACK 0
++#endif
++#ifndef IEEE80211_HW_NO_TKIP_WMM_HWACCEL
++#define IEEE80211_HW_NO_TKIP_WMM_HWACCEL 0
++#endif
++
+ #endif /* RT2X00_H */
+--- rt2x00.orig/drivers/net/wireless/rt2x00/rt2400pci.c
++++ rt2x00/drivers/net/wireless/rt2x00/rt2400pci.c
+@@ -1459,6 +1459,10 @@
+ * Initialize all hw fields.
+ */
+ rt2x00dev->hw->flags =
++ IEEE80211_HW_HOST_GEN_BEACON |
++ IEEE80211_HW_WEP_INCLUDE_IV |
++ IEEE80211_HW_DATA_NULLFUNC_ACK |
++ IEEE80211_HW_NO_TKIP_WMM_HWACCEL |
+ 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,10 @@
+ * Initialize all hw fields.
+ */
+ rt2x00dev->hw->flags =
++ IEEE80211_HW_HOST_GEN_BEACON |
++ IEEE80211_HW_WEP_INCLUDE_IV |
++ IEEE80211_HW_DATA_NULLFUNC_ACK |
++ IEEE80211_HW_NO_TKIP_WMM_HWACCEL |
+ 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,9 @@
+ * Initialize all hw fields.
+ */
+ rt2x00dev->hw->flags =
++ IEEE80211_HW_WEP_INCLUDE_IV |
++ IEEE80211_HW_DATA_NULLFUNC_ACK |
++ IEEE80211_HW_NO_TKIP_WMM_HWACCEL |
+ 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,9 @@
+ * Initialize all hw fields.
+ */
+ rt2x00dev->hw->flags =
++ IEEE80211_HW_WEP_INCLUDE_IV |
++ IEEE80211_HW_DATA_NULLFUNC_ACK |
++ IEEE80211_HW_NO_TKIP_WMM_HWACCEL |
+ 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,9 @@
+ * Initialize all hw fields.
+ */
+ rt2x00dev->hw->flags =
++ IEEE80211_HW_WEP_INCLUDE_IV |
++ IEEE80211_HW_DATA_NULLFUNC_ACK |
++ IEEE80211_HW_NO_TKIP_WMM_HWACCEL |
+ IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE |
+ IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
+ IEEE80211_HW_MONITOR_DURING_OPER |
Modified: unstable/rt2x00/debian/patches/series
===================================================================
--- unstable/rt2x00/debian/patches/series 2007-10-04 23:17:46 UTC (rev 28)
+++ unstable/rt2x00/debian/patches/series 2007-10-06 15:20:18 UTC (rev 29)
@@ -1,2 +1,2 @@
002_out_of_tree.diff
-003_workaround_2.6.22.diff
+003_workaround_mac80211_changes.diff
More information about the Pkg-ralink-commits
mailing list