From patchwork Wed Dec 1 15:04:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 371441 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oB1F4ULc018486 for ; Wed, 1 Dec 2010 15:04:30 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753887Ab0LAPEU (ORCPT ); Wed, 1 Dec 2010 10:04:20 -0500 Received: from server19320154104.serverpool.info ([193.201.54.104]:44164 "EHLO hauke-m.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753730Ab0LAPET (ORCPT ); Wed, 1 Dec 2010 10:04:19 -0500 Received: from localhost (localhost [127.0.0.1]) by hauke-m.de (Postfix) with ESMTP id E15CE87AA; Wed, 1 Dec 2010 16:04:18 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at hauke-m.de Received: from hauke-m.de ([127.0.0.1]) by localhost (hauke-m.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5OxYC894dLiY; Wed, 1 Dec 2010 16:04:13 +0100 (CET) Received: from localhost.localdomain (host-091-096-211-143.ewe-ip-backbone.de [91.96.211.143]) by hauke-m.de (Postfix) with ESMTPSA id 4A8C58799; Wed, 1 Dec 2010 16:04:13 +0100 (CET) From: Hauke Mehrtens To: lrodriguez@atheros.com Cc: linux-wireless@vger.kernel.org, mcgrof@infradead.org, Hauke Mehrtens Subject: [PATCH] compat-wireless: make patches apply again Date: Wed, 1 Dec 2010 16:04:11 +0100 Message-Id: <1291215851-1186-1-git-send-email-hauke@hauke-m.de> X-Mailer: git-send-email 1.7.1 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 01 Dec 2010 15:04:30 +0000 (UTC) diff --git a/crap/0002-ath9k-Add-pktlog-support.patch b/crap/0002-ath9k-Add-pktlog-support.patch index 78b2820..96ffc10 100644 --- a/crap/0002-ath9k-Add-pktlog-support.patch +++ b/crap/0002-ath9k-Add-pktlog-support.patch @@ -97,7 +97,7 @@ Signed-off-by: Vasanthakumar Thiagarajan return 0; --- a/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h -@@ -24,6 +24,7 @@ +@@ -25,6 +25,7 @@ #include "debug.h" #include "common.h" @@ -105,15 +105,15 @@ Signed-off-by: Vasanthakumar Thiagarajan /* * Header for the ath9k.ko driver core *only* -- hw code nor any other driver -@@ -544,6 +545,7 @@ struct ath_ant_comb { - #define SC_OP_BT_PRIORITY_DETECTED BIT(12) +@@ -546,6 +547,7 @@ struct ath_ant_comb { #define SC_OP_BT_SCAN BIT(13) #define SC_OP_ANI_RUN BIT(14) -+#define SC_OP_PKTLOGGING BIT(15) + #define SC_OP_ENABLE_APM BIT(15) ++#define SC_OP_PKTLOGGING BIT(16) /* Powersave flags */ #define PS_WAIT_FOR_BEACON BIT(0) -@@ -621,6 +623,10 @@ struct ath_softc { +@@ -623,6 +625,10 @@ struct ath_softc { #ifdef CONFIG_ATH9K_DEBUGFS struct ath9k_debug debug; #endif @@ -161,7 +161,7 @@ Signed-off-by: Vasanthakumar Thiagarajan static inline void ath9k_hw_set11n_txdesc(struct ath_hw *ah, void *ds, --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -2142,7 +2142,7 @@ void ath9k_hw_setrxfilter(struct ath_hw +@@ -2147,7 +2147,7 @@ void ath9k_hw_setrxfilter(struct ath_hw phybits |= AR_PHY_ERR_RADAR; if (bits & ATH9K_RX_FILTER_PHYERR) phybits |= AR_PHY_ERR_OFDM_TIMING | AR_PHY_ERR_CCK_TIMING; @@ -172,7 +172,7 @@ Signed-off-by: Vasanthakumar Thiagarajan REG_WRITE(ah, AR_RXCFG, --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h -@@ -616,7 +616,7 @@ struct ath_hw_ops { +@@ -617,7 +617,7 @@ struct ath_hw_ops { const void *ds0, dma_addr_t buf_addr, unsigned int qcu); int (*proc_txdesc)(struct ath_hw *ah, void *ds, @@ -181,7 +181,7 @@ Signed-off-by: Vasanthakumar Thiagarajan void (*set11n_txdesc)(struct ath_hw *ah, void *ds, u32 pktLen, enum ath9k_pkt_type type, u32 txPower, u32 keyIx, -@@ -845,6 +845,8 @@ struct ath_hw { +@@ -846,6 +846,8 @@ struct ath_hw { /* Enterprise mode cap */ u32 ent_mode; @@ -1310,7 +1310,7 @@ Signed-off-by: Vasanthakumar Thiagarajan if (conf_is_ht(&sc->hw->conf) && --- a/drivers/net/wireless/ath/ath9k/recv.c +++ b/drivers/net/wireless/ath/ath9k/recv.c -@@ -1617,6 +1617,7 @@ int ath_rx_tasklet(struct ath_softc *sc, +@@ -1619,6 +1619,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 /* * The hw can techncically differ from common->hw when using ath9k * virtual wiphy so to account for that we iterate over the active -@@ -1709,12 +1710,24 @@ int ath_rx_tasklet(struct ath_softc *sc, +@@ -1711,12 +1712,24 @@ int ath_rx_tasklet(struct ath_softc *sc, dma_type); skb_put(skb, rs.rs_datalen + ah->caps.rx_status_len); @@ -1355,7 +1355,7 @@ Signed-off-by: Vasanthakumar Thiagarajan if (!txpending || (tid->state & AGGR_CLEANUP)) { /* * complete the acked-ones/xretried ones; update -@@ -2006,7 +2008,7 @@ static void ath_tx_processq(struct ath_s +@@ -2025,7 +2027,7 @@ static void ath_tx_processq(struct ath_s ds = lastbf->bf_desc; memset(&ts, 0, sizeof(ts)); @@ -1364,7 +1364,7 @@ Signed-off-by: Vasanthakumar Thiagarajan if (status == -EINPROGRESS) { spin_unlock_bh(&txq->axq_lock); break; -@@ -2045,11 +2047,15 @@ static void ath_tx_processq(struct ath_s +@@ -2064,11 +2066,15 @@ static void ath_tx_processq(struct ath_s qnum = skb_get_queue_mapping(bf->bf_mpdu); @@ -1382,7 +1382,7 @@ Signed-off-by: Vasanthakumar Thiagarajan if (txq == sc->tx.txq_map[qnum]) ath_wake_mac80211_queue(sc, qnum); -@@ -2123,9 +2129,11 @@ void ath_tx_edma_tasklet(struct ath_soft +@@ -2142,9 +2148,11 @@ void ath_tx_edma_tasklet(struct ath_soft int status; int txok; int qnum; @@ -1395,7 +1395,7 @@ Signed-off-by: Vasanthakumar Thiagarajan if (status == -EINPROGRESS) break; if (status == -EIO) { -@@ -2168,16 +2176,20 @@ void ath_tx_edma_tasklet(struct ath_soft +@@ -2187,16 +2195,20 @@ void ath_tx_edma_tasklet(struct ath_soft qnum = skb_get_queue_mapping(bf->bf_mpdu);