aboutsummaryrefslogtreecommitdiffstats
path: root/package/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2012-10-04 21:39:22 +0000
committerHauke Mehrtens <hauke@openwrt.org>2012-10-04 21:39:22 +0000
commit2d6b8df868c98fb95d276807bb0b962c1de4757a (patch)
tree1229a11f725bfa58aa7c57a76898553bb5f6654a /package/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch
parent9eb5ed14827e731d44aa077f0f0a99e902af684c (diff)
downloadupstream-2d6b8df868c98fb95d276807bb0b962c1de4757a.tar.gz
upstream-2d6b8df868c98fb95d276807bb0b962c1de4757a.tar.bz2
upstream-2d6b8df868c98fb95d276807bb0b962c1de4757a.zip
[package] acx-mac80211: adapt interface changes in mac80211
The prototype of conf_tx and tx in struct ieee80211_ops changed some time ago and was not compatible with the prototype assumes by acs-mac80211. At least I do not see any compile warnings about this any more. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33624 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch')
-rw-r--r--package/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/package/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch b/package/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch
new file mode 100644
index 0000000000..34ecf6d4ac
--- /dev/null
+++ b/package/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch
@@ -0,0 +1,43 @@
+--- a/acx_func.h
++++ b/acx_func.h
+@@ -335,8 +335,11 @@ void acx_process_rxbuf(acx_device_t *ade
+ */
+ #if CONFIG_ACX_MAC80211_VERSION < KERNEL_VERSION(2, 6, 39)
+ int acx_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb);
+-#else
++#elif CONFIG_ACX_MAC80211_VERSION < KERNEL_VERSION(3, 7, 0)
+ void acx_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb);
++#else
++void acx_op_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,
++ struct sk_buff *skb);
+ #endif
+
+ void acx_tx_work(struct work_struct *work);
+--- a/common.c
++++ b/common.c
+@@ -232,8 +232,11 @@ static void acx_rx(acx_device_t *adev, r
+ /* Tx Path */
+ #if CONFIG_ACX_MAC80211_VERSION < KERNEL_VERSION(2, 6, 39)
+ int acx_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb);
+-#else
++#elif CONFIG_ACX_MAC80211_VERSION < KERNEL_VERSION(3, 7, 0)
+ void acx_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb);
++#else
++void acx_op_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,
++ struct sk_buff *skb);
+ #endif
+
+ //-void acx_tx_work(struct work_struct *work);
+@@ -5183,7 +5186,12 @@ out:
+ * acx_compat, and hiding this #if/else. OTOH, inclusion doesnt care
+ * about old kernels
+ */
++#if CONFIG_ACX_MAC80211_VERSION < KERNEL_VERSION(3, 7, 0)
+ OP_TX_RET_TYPE acx_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
++#else
++void acx_op_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,
++ struct sk_buff *skb)
++#endif
+ {
+ acx_device_t *adev = ieee2adev(hw);
+