From 06f3f01b06940547c3293aa8589696e24173dddd Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Sat, 12 Oct 2013 10:50:35 +0000 Subject: acx-mac80211: update to latest version Fixes compilation for linux 3.10. Signed-off-by: Jonas Gorski SVN-Revision: 38367 --- .../001-make-compatible-with-recent-mac80211.patch | 30 ---------------------- 1 file changed, 30 deletions(-) delete mode 100644 package/kernel/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch (limited to 'package/kernel/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch') diff --git a/package/kernel/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch b/package/kernel/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch deleted file mode 100644 index 707ba8bb4b..0000000000 --- a/package/kernel/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/main.h -+++ b/main.h -@@ -44,8 +44,11 @@ int acx_e_op_get_tx_stats(struct ieee802 - - #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 - - ---- a/main.c -+++ b/main.c -@@ -1024,7 +1024,12 @@ int acx_e_op_get_tx_stats(struct ieee802 - * 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); - -- cgit v1.2.3