diff options
| author | James <> | 2013-03-17 12:16:37 +0000 |
|---|---|---|
| committer | James <> | 2013-03-17 12:16:37 +0000 |
| commit | 27b76ab0671089c47506615a796a261e993896a7 (patch) | |
| tree | 61213d67e7fa87b20356b23798558e2c4212c42f /package/acx-mac80211/patches/.svn/text-base/001-make-compatible-with-recent-mac80211.patch.svn-base | |
| download | trunk-36060-master.tar.gz trunk-36060-master.tar.bz2 trunk-36060-master.zip | |
Diffstat (limited to 'package/acx-mac80211/patches/.svn/text-base/001-make-compatible-with-recent-mac80211.patch.svn-base')
| -rw-r--r-- | package/acx-mac80211/patches/.svn/text-base/001-make-compatible-with-recent-mac80211.patch.svn-base | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/package/acx-mac80211/patches/.svn/text-base/001-make-compatible-with-recent-mac80211.patch.svn-base b/package/acx-mac80211/patches/.svn/text-base/001-make-compatible-with-recent-mac80211.patch.svn-base new file mode 100644 index 0000000..707ba8b --- /dev/null +++ b/package/acx-mac80211/patches/.svn/text-base/001-make-compatible-with-recent-mac80211.patch.svn-base @@ -0,0 +1,30 @@ +--- 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); + |