diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-10-21 01:45:56 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-21 01:45:56 +0100 |
| commit | 520d0d75dd9f63219084adfd8d31913c71bd8311 (patch) | |
| tree | ec430ff9e2b05b94f9f492738060191099f1c38a /drivers | |
| parent | spectrum: Convert fib event handlers to use container_of on info arg (diff) | |
| parent | Merge remote-tracking branch 'net-next/master' (diff) | |
| download | linux-dev-520d0d75dd9f63219084adfd8d31913c71bd8311.tar.xz linux-dev-520d0d75dd9f63219084adfd8d31913c71bd8311.zip | |
Merge branch 'ieee802154-for-davem-2017-10-18' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan-next
Stefan Schmidt says:
====================
pull-request: ieee802154 2017-10-18
Please find below a pull request from the ieee802154 subsystem for net-next.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ieee802154/atusb.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/ieee802154/atusb.c b/drivers/net/ieee802154/atusb.c index 115fa3f37a86..d5584063049f 100644 --- a/drivers/net/ieee802154/atusb.c +++ b/drivers/net/ieee802154/atusb.c @@ -45,8 +45,6 @@ #define ATUSB_ALLOC_DELAY_MS 100 /* delay after failed allocation */ #define ATUSB_TX_TIMEOUT_MS 200 /* on the air timeout */ -struct atusb_chip_data; - struct atusb { struct ieee802154_hw *hw; struct usb_device *usb_dev; @@ -767,14 +765,14 @@ atusb_set_promiscuous_mode(struct ieee802154_hw *hw, const bool on) return 0; } -struct atusb_chip_data atusb_chip_data = { +static struct atusb_chip_data atusb_chip_data = { .t_channel_switch = 1, .rssi_base_val = -91, .set_txpower = atusb_set_txpower, .set_channel = atusb_set_channel, }; -struct atusb_chip_data hulusb_chip_data = { +static struct atusb_chip_data hulusb_chip_data = { .t_channel_switch = 11, .rssi_base_val = -100, .set_txpower = hulusb_set_txpower, @@ -1060,7 +1058,7 @@ static int atusb_probe(struct usb_interface *interface, atusb_get_and_show_build(atusb); atusb_set_extended_addr(atusb); - if (atusb->fw_ver_maj >= 0 && atusb->fw_ver_min >= 3) + if ((atusb->fw_ver_maj == 0 && atusb->fw_ver_min >= 3) || atusb->fw_ver_maj > 0) hw->flags |= IEEE802154_HW_FRAME_RETRIES; ret = atusb_get_and_clear_error(atusb); |