From 6e5ffd0f4509f7331ecebf12463f4eb5a213cf4a Mon Sep 17 00:00:00 2001 From: Prasanna Karthik Date: Mon, 17 Oct 2016 18:31:08 +0000 Subject: Bluetooth: hci_bcsp: Use setup_timer Kernel API instead of init_timer Replace init_timer function with setup_timer reported by coccinelle Signed-off-by: Prasanna Karthik Signed-off-by: Marcel Holtmann --- drivers/bluetooth/hci_bcsp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'drivers') diff --git a/drivers/bluetooth/hci_bcsp.c b/drivers/bluetooth/hci_bcsp.c index a2c921faaa12..910ec968f022 100644 --- a/drivers/bluetooth/hci_bcsp.c +++ b/drivers/bluetooth/hci_bcsp.c @@ -733,9 +733,7 @@ static int bcsp_open(struct hci_uart *hu) skb_queue_head_init(&bcsp->rel); skb_queue_head_init(&bcsp->unrel); - init_timer(&bcsp->tbcsp); - bcsp->tbcsp.function = bcsp_timed_event; - bcsp->tbcsp.data = (u_long)hu; + setup_timer(&bcsp->tbcsp, bcsp_timed_event, (u_long)hu); bcsp->rx_state = BCSP_W4_PKT_DELIMITER; -- cgit v1.2.3 From a1e0d04396684a38fd4cdaf084d38bf2cd5a2253 Mon Sep 17 00:00:00 2001 From: Prasanna Karthik Date: Tue, 18 Oct 2016 17:30:10 +0000 Subject: Bluetooth: hci_h5: Use setup_timer Kernel API instead of init_timer Replace init_timer function with setup_timer reported by coccinelle Signed-off-by: Prasanna Karthik Signed-off-by: Marcel Holtmann --- drivers/bluetooth/hci_h5.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'drivers') diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c index 0879d64b1caf..90d0456b6744 100644 --- a/drivers/bluetooth/hci_h5.c +++ b/drivers/bluetooth/hci_h5.c @@ -204,9 +204,7 @@ static int h5_open(struct hci_uart *hu) h5_reset_rx(h5); - init_timer(&h5->timer); - h5->timer.function = h5_timed_event; - h5->timer.data = (unsigned long)hu; + setup_timer(&h5->timer, h5_timed_event, (unsigned long)hu); h5->tx_win = H5_TX_WIN_MAX; -- cgit v1.2.3 From 1ae6d00ad05730bca283dc09e7a9c162c2f22b01 Mon Sep 17 00:00:00 2001 From: Prasanna Karthik Date: Tue, 18 Oct 2016 23:55:12 +0000 Subject: Bluetooth: hci_qca: Use setup_timer Kernel API instead of init_timer Replace init_timer function with setup_timer reported by coccinelle Signed-off-by: Prasanna Karthik Signed-off-by: Marcel Holtmann --- drivers/bluetooth/hci_qca.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'drivers') diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index 6c867fbc56a7..05c230719a47 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -438,14 +438,11 @@ static int qca_open(struct hci_uart *hu) hu->priv = qca; - init_timer(&qca->wake_retrans_timer); - qca->wake_retrans_timer.function = hci_ibs_wake_retrans_timeout; - qca->wake_retrans_timer.data = (u_long)hu; + setup_timer(&qca->wake_retrans_timer, hci_ibs_wake_retrans_timeout, + (u_long)hu); qca->wake_retrans = IBS_WAKE_RETRANS_TIMEOUT_MS; - init_timer(&qca->tx_idle_timer); - qca->tx_idle_timer.function = hci_ibs_tx_idle_timeout; - qca->tx_idle_timer.data = (u_long)hu; + setup_timer(&qca->tx_idle_timer, hci_ibs_tx_idle_timeout, (u_long)hu); qca->tx_idle_delay = IBS_TX_IDLE_TIMEOUT_MS; BT_DBG("HCI_UART_QCA open, tx_idle_delay=%u, wake_retrans=%u", -- cgit v1.2.3 From 4d7101d76572257dbbdca0e17f132a04e4b2b77d Mon Sep 17 00:00:00 2001 From: Alexander Aring Date: Tue, 6 Sep 2016 09:50:04 +0200 Subject: at86rf230: fix cca ed values for rf233 This patch changes the rssi base value to -94 for at86rf33 transceivers. The code before assumes a rssi base value of -91 which is for the at86rf231 transceiver only. This change need to update the cca ed threshold mapping table. Signed-off-by: Alexander Aring Acked-by: Stefan Schmidt Signed-off-by: Stefan Schmidt --- drivers/net/ieee802154/at86rf230.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'drivers') diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c index 9f10da60e02d..057025722e3d 100644 --- a/drivers/net/ieee802154/at86rf230.c +++ b/drivers/net/ieee802154/at86rf230.c @@ -990,7 +990,12 @@ at86rf23x_set_channel(struct at86rf230_local *lp, u8 page, u8 channel) } #define AT86RF2XX_MAX_ED_LEVELS 0xF -static const s32 at86rf23x_ed_levels[AT86RF2XX_MAX_ED_LEVELS + 1] = { +static const s32 at86rf233_ed_levels[AT86RF2XX_MAX_ED_LEVELS + 1] = { + -9400, -9200, -9000, -8800, -8600, -8400, -8200, -8000, -7800, -7600, + -7400, -7200, -7000, -6800, -6600, -6400, +}; + +static const s32 at86rf231_ed_levels[AT86RF2XX_MAX_ED_LEVELS + 1] = { -9100, -8900, -8700, -8500, -8300, -8100, -7900, -7700, -7500, -7300, -7100, -6900, -6700, -6500, -6300, -6100, }; @@ -1343,7 +1348,7 @@ static struct at86rf2xx_chip_data at86rf233_data = { .t_sleep_to_off = 1000, .t_frame = 4096, .t_p_ack = 545, - .rssi_base_val = -91, + .rssi_base_val = -94, .set_channel = at86rf23x_set_channel, .set_txpower = at86rf23x_set_txpower, }; @@ -1557,9 +1562,6 @@ at86rf230_detect_device(struct at86rf230_local *lp) lp->hw->phy->supported.cca_opts = BIT(NL802154_CCA_OPT_ENERGY_CARRIER_AND) | BIT(NL802154_CCA_OPT_ENERGY_CARRIER_OR); - lp->hw->phy->supported.cca_ed_levels = at86rf23x_ed_levels; - lp->hw->phy->supported.cca_ed_levels_size = ARRAY_SIZE(at86rf23x_ed_levels); - lp->hw->phy->cca.mode = NL802154_CCA_ENERGY; switch (part) { @@ -1575,6 +1577,8 @@ at86rf230_detect_device(struct at86rf230_local *lp) lp->hw->phy->symbol_duration = 16; lp->hw->phy->supported.tx_powers = at86rf231_powers; lp->hw->phy->supported.tx_powers_size = ARRAY_SIZE(at86rf231_powers); + lp->hw->phy->supported.cca_ed_levels = at86rf231_ed_levels; + lp->hw->phy->supported.cca_ed_levels_size = ARRAY_SIZE(at86rf231_ed_levels); break; case 7: chip = "at86rf212"; @@ -1598,6 +1602,8 @@ at86rf230_detect_device(struct at86rf230_local *lp) lp->hw->phy->symbol_duration = 16; lp->hw->phy->supported.tx_powers = at86rf233_powers; lp->hw->phy->supported.tx_powers_size = ARRAY_SIZE(at86rf233_powers); + lp->hw->phy->supported.cca_ed_levels = at86rf233_ed_levels; + lp->hw->phy->supported.cca_ed_levels_size = ARRAY_SIZE(at86rf233_ed_levels); break; default: chip = "unknown"; -- cgit v1.2.3 From e03551d7b99c35d7d35f6862c37e3ce9f7c6787c Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Tue, 22 Nov 2016 14:02:07 +0100 Subject: ieee802154: fakelb: print number of created fake devices during probe When using fakelb with different network sizes it becomes handy to have the number of created fake devices printed in the log as well. Signed-off-by: Stefan Schmidt --- drivers/net/ieee802154/fakelb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/net/ieee802154/fakelb.c b/drivers/net/ieee802154/fakelb.c index ec387efb61d0..0d673f7682ee 100644 --- a/drivers/net/ieee802154/fakelb.c +++ b/drivers/net/ieee802154/fakelb.c @@ -218,7 +218,7 @@ static int fakelb_probe(struct platform_device *pdev) goto err_slave; } - dev_info(&pdev->dev, "added ieee802154 hardware\n"); + dev_info(&pdev->dev, "added %i fake ieee802154 hardware devices\n", numlbs); return 0; err_slave: -- cgit v1.2.3