diff options
| author | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-06-21 16:54:37 +0000 |
|---|---|---|
| committer | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-06-21 16:54:37 +0000 |
| commit | 4d953d3a481dd847524eae78c7aae00153bc7efd (patch) | |
| tree | 37c9cbe251e4fb790aaa72e862c35822be30b491 /package/kernel/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch | |
| parent | 801985e5286881dd578a19280b2a6c8e212a530d (diff) | |
packages: clean up the package folder
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37007 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch')
| -rw-r--r-- | package/kernel/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch | 30 |
1 files changed, 30 insertions, 0 deletions
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 new file mode 100644 index 0000000000..707ba8bb4b --- /dev/null +++ b/package/kernel/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch @@ -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); + |