summaryrefslogtreecommitdiff
path: root/crap
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2010-08-30 14:46:36 -0700
committerLuis R. Rodriguez <lrodriguez@atheros.com>2010-08-30 14:46:59 -0700
commit3b714ff15ef1b3b714e8eebab99969da4d466d5f (patch)
tree243b6cc02ef9064b86eebb06a202ceb5f196a6b9 /crap
parentcfe95b08f248d87bf391bb039b5b0a9eb60d673f (diff)
compat-wireless: fix compilation on iface.c
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Diffstat (limited to 'crap')
-rw-r--r--crap/0002-ath9k-Add-pktlog-support.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/crap/0002-ath9k-Add-pktlog-support.patch b/crap/0002-ath9k-Add-pktlog-support.patch
index d8e4b689..117c2659 100644
--- a/crap/0002-ath9k-Add-pktlog-support.patch
+++ b/crap/0002-ath9k-Add-pktlog-support.patch
@@ -113,7 +113,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
/* Powersave flags */
#define PS_WAIT_FOR_BEACON BIT(0)
-@@ -592,6 +594,10 @@ struct ath_softc {
+@@ -593,6 +595,10 @@ struct ath_softc {
#ifdef CONFIG_ATH9K_DEBUGFS
struct ath9k_debug debug;
#endif
@@ -1310,7 +1310,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
if (conf_is_ht(&sc->hw->conf) &&
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
-@@ -1080,6 +1080,7 @@ int ath_rx_tasklet(struct ath_softc *sc,
+@@ -1084,6 +1084,7 @@ int ath_rx_tasklet(struct ath_softc *sc,
struct ieee80211_rx_status *rxs;
struct ath_hw *ah = sc->sc_ah;
struct ath_common *common = ath9k_hw_common(ah);
@@ -1318,7 +1318,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
/*
* The hw can techncically differ from common->hw when using ath9k
* virtual wiphy so to account for that we iterate over the active
-@@ -1171,12 +1172,24 @@ int ath_rx_tasklet(struct ath_softc *sc,
+@@ -1175,12 +1176,24 @@ int ath_rx_tasklet(struct ath_softc *sc,
dma_type);
skb_put(skb, rs.rs_datalen + ah->caps.rx_status_len);