From 4af9a0cdfccbf327aa046f6aad65cecd806c988e Mon Sep 17 00:00:00 2001 From: Jakub Kicinski Date: Mon, 9 Feb 2015 22:41:37 +0100 Subject: [PATCH 1/3] correct aggregation stats offset calculation Signed-off-by: Jakub Kicinski --- regs.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/regs.h b/regs.h index efeb61e7..5636dccc 100644 --- a/regs.h +++ b/regs.h @@ -425,8 +425,9 @@ #define MT_TX_AGG_CNT_BASE0 0x1720 #define MT_TX_AGG_CNT_BASE1 0x174c -#define MT_TX_AGG_CNT(_id) (((_id) > 7 ? MT_TX_AGG_CNT_BASE1 : \ - MT_TX_AGG_CNT_BASE0) + ((_id) << 2)) +#define MT_TX_AGG_CNT(_id) ((_id) < 8 ? \ + MT_TX_AGG_CNT_BASE0 + ((_id) << 2) : \ + MT_TX_AGG_CNT_BASE1 + ((_id - 8) << 2)) #define MT_TX_STAT_FIFO_EXT 0x1798 #define MT_TX_STAT_FIFO_EXT_RETRY GENMASK(7, 0) From 9553279f3d7fa5e42ff5775f17d2fbb54b62ec76 Mon Sep 17 00:00:00 2001 From: Jakub Kicinski Date: Tue, 17 Feb 2015 17:59:10 +0100 Subject: [PATCH 2/3] correct spelling INITAILIZED -> INITIALIZED Signed-off-by: Jakub Kicinski --- core.c | 2 +- init.c | 2 +- mt76.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core.c b/core.c index 8e68a934..a60f790a 100644 --- a/core.c +++ b/core.c @@ -78,7 +78,7 @@ irqreturn_t mt76_irq_handler(int irq, void *dev_instance) intr = mt76_rr(dev, MT_INT_SOURCE_CSR); mt76_wr(dev, MT_INT_SOURCE_CSR, intr); - if (!test_bit(MT76_STATE_INITAILIZED, &dev->state)) + if (!test_bit(MT76_STATE_INITIALIZED, &dev->state)) return IRQ_NONE; trace_dev_irq(dev, intr, dev->irqmask); diff --git a/init.c b/init.c index 1134d034..cfa1559d 100644 --- a/init.c +++ b/init.c @@ -507,7 +507,7 @@ int mt76_init_hardware(struct mt76_dev *dev) if (ret) return ret; - set_bit(MT76_STATE_INITAILIZED, &dev->state); + set_bit(MT76_STATE_INITIALIZED, &dev->state); ret = mt76_mac_start(dev); if (ret) return ret; diff --git a/mt76.h b/mt76.h index 260b329e..868ee5cb 100644 --- a/mt76.h +++ b/mt76.h @@ -58,7 +58,7 @@ struct mt76_queue_entry { }; enum { - MT76_STATE_INITAILIZED, + MT76_STATE_INITIALIZED, MT76_STATE_RUNNING, MT76_SCANNING, }; From 295951c20a6abe4960ddd16e04a7f8227244430f Mon Sep 17 00:00:00 2001 From: Jakub Kicinski Date: Mon, 23 Feb 2015 18:42:35 +0100 Subject: [PATCH 3/3] use precision to cap length of firmware strings It is the precision not field width in the format which limits length of printed string. Fixes: 28f93be713b3 ("remove get_string helper") Signed-off-by: Jakub Kicinski --- mcu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mcu.c b/mcu.c index 860857dc..c78b527b 100644 --- a/mcu.c +++ b/mcu.c @@ -161,7 +161,7 @@ mt76pci_load_rom_patch(struct mt76_dev *dev) } hdr = (struct mt76_patch_header *) fw->data; - printk("ROM patch build: %15s\n", hdr->build_time); + printk("ROM patch build: %.15s\n", hdr->build_time); mt76_wr(dev, MT_MCU_PCIE_REMAP_BASE4, MT_MCU_ROM_PATCH_OFFSET); @@ -217,7 +217,7 @@ mt76pci_load_firmware(struct mt76_dev *dev) val = le16_to_cpu(hdr->build_ver); printk("Build: %x\n", val); - printk("Build Time: %16s\n", hdr->build_time); + printk("Build Time: %.16s\n", hdr->build_time); cur = (__le32 *) (fw->data + sizeof(*hdr)); len = le32_to_cpu(hdr->ilm_len);