| 1 | --- a/acx_func.h |
| 2 | +++ b/acx_func.h |
| 3 | @@ -335,8 +335,11 @@ void acx_process_rxbuf(acx_device_t *ade |
| 4 | */ |
| 5 | #if CONFIG_ACX_MAC80211_VERSION < KERNEL_VERSION(2, 6, 39) |
| 6 | int acx_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb); |
| 7 | -#else |
| 8 | +#elif CONFIG_ACX_MAC80211_VERSION < KERNEL_VERSION(3, 7, 0) |
| 9 | void acx_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb); |
| 10 | +#else |
| 11 | +void acx_op_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control, |
| 12 | + struct sk_buff *skb); |
| 13 | #endif |
| 14 | |
| 15 | void acx_tx_work(struct work_struct *work); |
| 16 | --- a/common.c |
| 17 | +++ b/common.c |
| 18 | @@ -232,8 +232,11 @@ static void acx_rx(acx_device_t *adev, r |
| 19 | /* Tx Path */ |
| 20 | #if CONFIG_ACX_MAC80211_VERSION < KERNEL_VERSION(2, 6, 39) |
| 21 | int acx_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb); |
| 22 | -#else |
| 23 | +#elif CONFIG_ACX_MAC80211_VERSION < KERNEL_VERSION(3, 7, 0) |
| 24 | void acx_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb); |
| 25 | +#else |
| 26 | +void acx_op_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control, |
| 27 | + struct sk_buff *skb); |
| 28 | #endif |
| 29 | |
| 30 | //-void acx_tx_work(struct work_struct *work); |
| 31 | @@ -5183,7 +5186,12 @@ out: |
| 32 | * acx_compat, and hiding this #if/else. OTOH, inclusion doesnt care |
| 33 | * about old kernels |
| 34 | */ |
| 35 | +#if CONFIG_ACX_MAC80211_VERSION < KERNEL_VERSION(3, 7, 0) |
| 36 | OP_TX_RET_TYPE acx_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb) |
| 37 | +#else |
| 38 | +void acx_op_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control, |
| 39 | + struct sk_buff *skb) |
| 40 | +#endif |
| 41 | { |
| 42 | acx_device_t *adev = ieee2adev(hw); |
| 43 | |
| 44 | |
