From: Luis R. Rodriguez Date: Wed, 30 Mar 2011 18:19:04 +0000 (-0700) Subject: compat-wireless: refresh crap patches X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=65723483c251ca3523b2dad47842388a5408d00c;p=openwrt%2Fstaging%2Fblogic.git compat-wireless: refresh crap patches Signed-off-by: Luis R. Rodriguez --- diff --git a/crap/0002-ath9k-Add-pktlog-support.patch b/crap/0002-ath9k-Add-pktlog-support.patch index 68b04ee7091e..67cf6849a818 100644 --- a/crap/0002-ath9k-Add-pktlog-support.patch +++ b/crap/0002-ath9k-Add-pktlog-support.patch @@ -55,7 +55,7 @@ Signed-off-by: Vasanthakumar Thiagarajan + --- a/drivers/net/wireless/ath/ath9k/Makefile +++ b/drivers/net/wireless/ath/ath9k/Makefile -@@ -10,6 +10,7 @@ ath9k-$(CONFIG_ATH9K_RATE_CONTROL) += rc +@@ -9,6 +9,7 @@ ath9k-$(CONFIG_ATH9K_RATE_CONTROL) += rc ath9k-$(CONFIG_PCI) += pci.o ath9k-$(CONFIG_ATHEROS_AR71XX) += ahb.o ath9k-$(CONFIG_ATH9K_DEBUGFS) += debug.o @@ -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 -@@ -25,6 +25,7 @@ +@@ -24,6 +24,7 @@ #include "debug.h" #include "common.h" @@ -105,7 +105,7 @@ Signed-off-by: Vasanthakumar Thiagarajan /* * Header for the ath9k.ko driver core *only* -- hw code nor any other driver -@@ -549,6 +550,7 @@ struct ath_ant_comb { +@@ -550,6 +551,7 @@ struct ath_ant_comb { #define SC_OP_BT_SCAN BIT(13) #define SC_OP_ANI_RUN BIT(14) #define SC_OP_ENABLE_APM BIT(15) @@ -113,9 +113,9 @@ Signed-off-by: Vasanthakumar Thiagarajan /* Powersave flags */ #define PS_WAIT_FOR_BEACON BIT(0) -@@ -626,6 +628,10 @@ struct ath_softc { - #ifdef CONFIG_ATH9K_DEBUGFS - struct ath9k_debug debug; +@@ -629,6 +631,10 @@ struct ath_softc { + struct list_head nodes; /* basically, stations */ + unsigned int tx_complete_poll_work_seen; #endif +#ifdef CONFIG_ATH9K_PKTLOG + struct ath_pktlog_debugfs pktlog; @@ -123,10 +123,10 @@ Signed-off-by: Vasanthakumar Thiagarajan + bool is_pkt_logging; struct ath_beacon_config cur_beacon_conf; struct delayed_work tx_complete_work; - struct ath_btcoex btcoex; + struct delayed_work hw_pll_work; --- a/drivers/net/wireless/ath/ath9k/debug.c +++ b/drivers/net/wireless/ath/ath9k/debug.c -@@ -908,6 +908,9 @@ static int open_file_regdump(struct inod +@@ -1066,6 +1066,9 @@ static int open_file_regdump(struct inod file->private_data = buf; @@ -136,7 +136,7 @@ Signed-off-by: Vasanthakumar Thiagarajan return 0; } -@@ -982,6 +985,7 @@ int ath9k_init_debug(struct ath_hw *ah) +@@ -1148,6 +1151,7 @@ int ath9k_init_debug(struct ath_hw *ah) sc->debug.regidx = 0; return 0; err: @@ -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 -@@ -2150,7 +2150,7 @@ void ath9k_hw_setrxfilter(struct ath_hw +@@ -2192,7 +2192,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 { +@@ -620,7 +620,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, -@@ -852,6 +852,8 @@ struct ath_hw { +@@ -856,6 +856,8 @@ struct ath_hw { /* Enterprise mode cap */ u32 ent_mode; @@ -1309,7 +1309,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 -@@ -1577,6 +1577,7 @@ +@@ -1577,6 +1577,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); @@ -1317,7 +1317,7 @@ Signed-off-by: Vasanthakumar Thiagarajan /* * The hw can technically differ from common->hw when using ath9k * virtual wiphy so to account for that we iterate over the active -@@ -1676,13 +1677,24 @@ +@@ -1676,13 +1677,24 @@ int ath_rx_tasklet(struct ath_softc *sc, dma_type); skb_put(skb, rs.rs_datalen + ah->caps.rx_status_len); @@ -1345,7 +1345,7 @@ Signed-off-by: Vasanthakumar Thiagarajan bf->bf_buf_addr = dma_map_single(sc->dev, requeue_skb->data, --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c -@@ -475,6 +475,8 @@ +@@ -475,6 +475,8 @@ static void ath_tx_complete_aggr(struct list_move_tail(&bf->list, &bf_head); } @@ -1354,7 +1354,7 @@ Signed-off-by: Vasanthakumar Thiagarajan if (!txpending || (tid->state & AGGR_CLEANUP)) { /* * complete the acked-ones/xretried ones; update -@@ -2043,7 +2045,7 @@ +@@ -2043,7 +2045,7 @@ static void ath_tx_processq(struct ath_s ds = lastbf->bf_desc; memset(&ts, 0, sizeof(ts)); @@ -1363,7 +1363,7 @@ Signed-off-by: Vasanthakumar Thiagarajan if (status == -EINPROGRESS) { spin_unlock_bh(&txq->axq_lock); break; -@@ -2085,11 +2087,15 @@ +@@ -2085,11 +2087,15 @@ static void ath_tx_processq(struct ath_s ath_tx_rc_status(sc, bf, &ts, 1, txok ? 0 : 1, txok, true); } @@ -1381,7 +1381,7 @@ Signed-off-by: Vasanthakumar Thiagarajan spin_lock_bh(&txq->axq_lock); -@@ -2210,9 +2216,11 @@ +@@ -2210,9 +2216,11 @@ void ath_tx_edma_tasklet(struct ath_soft struct list_head bf_head; int status; int txok; @@ -1394,7 +1394,7 @@ Signed-off-by: Vasanthakumar Thiagarajan if (status == -EINPROGRESS) break; if (status == -EIO) { -@@ -2258,9 +2266,13 @@ +@@ -2258,9 +2266,13 @@ void ath_tx_edma_tasklet(struct ath_soft if (bf_isampdu(bf)) ath_tx_complete_aggr(sc, txq, bf, &bf_head, &txs, txok, true); diff --git a/crap/0003-btusb-Add-fw-load-support.patch b/crap/0003-btusb-Add-fw-load-support.patch index af169420d2b9..513f995ca90b 100644 --- a/crap/0003-btusb-Add-fw-load-support.patch +++ b/crap/0003-btusb-Add-fw-load-support.patch @@ -77,7 +77,7 @@ Subject: [PATCH] Added support to load firmware to target RAM from btusb transpo static struct usb_device_id btusb_table[] = { /* Generic Bluetooth USB device */ { USB_DEVICE_INFO(0xe0, 0x01, 0x01) }, -@@ -878,6 +899,7 @@ static int btusb_probe(struct usb_interf +@@ -887,6 +908,7 @@ static int btusb_probe(struct usb_interf struct btusb_data *data; struct hci_dev *hdev; int i, err; @@ -85,7 +85,7 @@ Subject: [PATCH] Added support to load firmware to target RAM from btusb transpo BT_DBG("intf %p id %p", intf, id); -@@ -937,6 +959,19 @@ static int btusb_probe(struct usb_interf +@@ -946,6 +968,19 @@ static int btusb_probe(struct usb_interf data->udev = interface_to_usbdev(intf); data->intf = intf; @@ -105,7 +105,7 @@ Subject: [PATCH] Added support to load firmware to target RAM from btusb transpo spin_lock_init(&data->lock); INIT_WORK(&data->work, btusb_work); -@@ -1047,12 +1082,26 @@ static void btusb_disconnect(struct usb_ +@@ -1054,12 +1089,26 @@ static void btusb_disconnect(struct usb_ { struct btusb_data *data = usb_get_intfdata(intf); struct hci_dev *hdev; @@ -132,7 +132,7 @@ Subject: [PATCH] Added support to load firmware to target RAM from btusb transpo hdev = data->hdev; __hci_dev_hold(hdev); -@@ -1078,12 +1127,22 @@ static void btusb_disconnect(struct usb_ +@@ -1085,12 +1134,22 @@ static void btusb_disconnect(struct usb_ static int btusb_suspend(struct usb_interface *intf, pm_message_t message) { struct btusb_data *data = usb_get_intfdata(intf); @@ -155,7 +155,7 @@ Subject: [PATCH] Added support to load firmware to target RAM from btusb transpo spin_lock_irq(&data->txlock); if (!((message.event & PM_EVENT_AUTO) && data->tx_in_flight)) { set_bit(BTUSB_SUSPENDING, &data->flags); -@@ -1196,6 +1255,14 @@ static int __init btusb_init(void) +@@ -1203,6 +1262,14 @@ static int __init btusb_init(void) static void __exit btusb_exit(void) {