1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-25 21:23:21 +02:00
openwrt-xburst/package/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch
florian 5bf5d0ac12 [package] acx-mac80211: update to v2012-09-23-WIP
Patch from Daniel Gimpelevich.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33746 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-10-13 17:46:42 +00:00

31 lines
920 B
Diff

--- a/main.h
+++ b/main.h
@@ -44,8 +44,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
--- a/main.c
+++ b/main.c
@@ -1024,7 +1024,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);