707ba8bb4b5f90d854229cef97c484253d7b8a3a
[openwrt/staging/wigyori.git] / package / acx-mac80211 / patches / 001-make-compatible-with-recent-mac80211.patch
1 --- a/main.h
2 +++ b/main.h
3 @@ -44,8 +44,11 @@ int acx_e_op_get_tx_stats(struct ieee802
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
16 --- a/main.c
17 +++ b/main.c
18 @@ -1024,7 +1024,12 @@ int acx_e_op_get_tx_stats(struct ieee802
19 * acx_compat, and hiding this #if/else. OTOH, inclusion doesnt care
20 * about old kernels
21 */
22 +#if CONFIG_ACX_MAC80211_VERSION < KERNEL_VERSION(3, 7, 0)
23 OP_TX_RET_TYPE acx_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
24 +#else
25 +void acx_op_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,
26 + struct sk_buff *skb)
27 +#endif
28 {
29 acx_device_t *adev = ieee2adev(hw);
30