From a95157c262a1c1c75151bbda240f7c107c6a9a53 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 5 Dec 2011 14:20:17 +0000 Subject: mac80211: update to 2011-12-01 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29436 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/mac80211/patches/513-ath9k_channelbw_debugfs.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'package/mac80211/patches/513-ath9k_channelbw_debugfs.patch') diff --git a/package/mac80211/patches/513-ath9k_channelbw_debugfs.patch b/package/mac80211/patches/513-ath9k_channelbw_debugfs.patch index ef568dc2ad..c5ca0e2b57 100644 --- a/package/mac80211/patches/513-ath9k_channelbw_debugfs.patch +++ b/package/mac80211/patches/513-ath9k_channelbw_debugfs.patch @@ -8,7 +8,7 @@ int chan_idx; int chan_is_ht; struct survey_info *cur_survey; -@@ -654,6 +655,7 @@ struct ath_softc { +@@ -655,6 +656,7 @@ struct ath_softc { u8 ant_tx, ant_rx; }; @@ -81,7 +81,7 @@ sc->debug.sampidx = 0; --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c -@@ -1554,7 +1554,7 @@ static void ath9k_disable_ps(struct ath_ +@@ -1564,7 +1564,7 @@ static void ath9k_disable_ps(struct ath_ } @@ -90,7 +90,7 @@ { struct ath_softc *sc = hw->priv; struct ath_hw *ah = sc->sc_ah; -@@ -1606,9 +1606,10 @@ static int ath9k_config(struct ieee80211 +@@ -1616,9 +1616,10 @@ static int ath9k_config(struct ieee80211 if (changed & IEEE80211_CONF_CHANGE_CHANNEL) { struct ieee80211_channel *curchan = hw->conf.channel; @@ -102,7 +102,7 @@ unsigned long flags; if (ah->curchan) -@@ -1661,7 +1662,23 @@ static int ath9k_config(struct ieee80211 +@@ -1671,7 +1672,23 @@ static int ath9k_config(struct ieee80211 memset(&sc->survey[pos], 0, sizeof(struct survey_info)); } @@ -129,7 +129,7 @@ return -EINVAL; --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -1549,6 +1549,10 @@ int ath9k_hw_reset(struct ath_hw *ah, st +@@ -1609,6 +1609,10 @@ int ath9k_hw_reset(struct ath_hw *ah, st caldata->rtt_hist.num_readings) allow_fbs = true; -- cgit v1.2.3