diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2013-07-12 13:10:43 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2013-07-12 13:10:43 +0000 |
| commit | 32f8e1d2dfca21641364cf59b58a6fc28912aacc (patch) | |
| tree | 82b08c41a7de466904ad000490fe636383b546a9 /package/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch | |
| parent | d1af787dc992741bffa1a1ce0b4ca7eacb1f7227 (diff) | |
| download | upstream-32f8e1d2dfca21641364cf59b58a6fc28912aacc.tar.gz upstream-32f8e1d2dfca21641364cf59b58a6fc28912aacc.tar.bz2 upstream-32f8e1d2dfca21641364cf59b58a6fc28912aacc.zip | |
AA: acx-mac80211: make it compile with recent mac80211 again
backport of r35332, r36481 and r36976
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@37267 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch')
| -rw-r--r-- | package/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch b/package/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch index 3b1afee412..707ba8bb4b 100644 --- a/package/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch +++ b/package/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch @@ -1,6 +1,6 @@ --- a/main.h +++ b/main.h -@@ -44,8 +44,11 @@ void acx_process_rxbuf(acx_device_t *ade +@@ -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); @@ -15,7 +15,7 @@ --- a/main.c +++ b/main.c -@@ -1024,7 +1024,12 @@ out: +@@ -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 */ |