diff options
author | Luis R. Rodriguez | 2010-08-30 16:46:36 -0500 |
---|---|---|
committer | Luis R. Rodriguez | 2010-08-30 16:46:59 -0500 |
commit | 3b714ff15ef1b3b714e8eebab99969da4d466d5f (patch) | |
tree | 243b6cc02ef9064b86eebb06a202ceb5f196a6b9 /crap | |
parent | cfe95b08f248d87bf391bb039b5b0a9eb60d673f (diff) | |
download | compat-wireless-3b714ff15ef1b3b714e8eebab99969da4d466d5f.tar.gz compat-wireless-3b714ff15ef1b3b714e8eebab99969da4d466d5f.tar.xz compat-wireless-3b714ff15ef1b3b714e8eebab99969da4d466d5f.zip |
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.patch | 6 |
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 d8e4b68..117c265 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> | |||
113 | 113 | ||
114 | /* Powersave flags */ | 114 | /* Powersave flags */ |
115 | #define PS_WAIT_FOR_BEACON BIT(0) | 115 | #define PS_WAIT_FOR_BEACON BIT(0) |
116 | @@ -592,6 +594,10 @@ struct ath_softc { | 116 | @@ -593,6 +595,10 @@ struct ath_softc { |
117 | #ifdef CONFIG_ATH9K_DEBUGFS | 117 | #ifdef CONFIG_ATH9K_DEBUGFS |
118 | struct ath9k_debug debug; | 118 | struct ath9k_debug debug; |
119 | #endif | 119 | #endif |
@@ -1310,7 +1310,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com> | |||
1310 | if (conf_is_ht(&sc->hw->conf) && | 1310 | if (conf_is_ht(&sc->hw->conf) && |
1311 | --- a/drivers/net/wireless/ath/ath9k/recv.c | 1311 | --- a/drivers/net/wireless/ath/ath9k/recv.c |
1312 | +++ b/drivers/net/wireless/ath/ath9k/recv.c | 1312 | +++ b/drivers/net/wireless/ath/ath9k/recv.c |
1313 | @@ -1080,6 +1080,7 @@ int ath_rx_tasklet(struct ath_softc *sc, | 1313 | @@ -1084,6 +1084,7 @@ int ath_rx_tasklet(struct ath_softc *sc, |
1314 | struct ieee80211_rx_status *rxs; | 1314 | struct ieee80211_rx_status *rxs; |
1315 | struct ath_hw *ah = sc->sc_ah; | 1315 | struct ath_hw *ah = sc->sc_ah; |
1316 | struct ath_common *common = ath9k_hw_common(ah); | 1316 | struct ath_common *common = ath9k_hw_common(ah); |
@@ -1318,7 +1318,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com> | |||
1318 | /* | 1318 | /* |
1319 | * The hw can techncically differ from common->hw when using ath9k | 1319 | * The hw can techncically differ from common->hw when using ath9k |
1320 | * virtual wiphy so to account for that we iterate over the active | 1320 | * virtual wiphy so to account for that we iterate over the active |
1321 | @@ -1171,12 +1172,24 @@ int ath_rx_tasklet(struct ath_softc *sc, | 1321 | @@ -1175,12 +1176,24 @@ int ath_rx_tasklet(struct ath_softc *sc, |
1322 | dma_type); | 1322 | dma_type); |
1323 | 1323 | ||
1324 | skb_put(skb, rs.rs_datalen + ah->caps.rx_status_len); | 1324 | skb_put(skb, rs.rs_datalen + ah->caps.rx_status_len); |