]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
ieee802154: atusb: implement .set_frame_retries ops callback
authorStefan Schmidt <stefan@osg.samsung.com>
Mon, 5 Dec 2016 13:47:20 +0000 (14:47 +0100)
committerMarcel Holtmann <marcel@holtmann.org>
Thu, 8 Dec 2016 06:43:29 +0000 (07:43 +0100)
From firmware version 0.3 onwards we use the TX_ARET mode allowing for automatic
frame retransmissions. To actually make use of this feature we need to implement
the callback for setting the frame retries.

If the firmware version is to old print a warning and return with invalid value.

Signed-off-by: Stefan Schmidt <stefan@osg.samsung.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
drivers/net/ieee802154/atusb.c

index 3ed34cc8a2f84a686266f121ead06292172222cc..1253f864737ae3cfb10a95ee8c916b5c04dd94b6 100644 (file)
@@ -545,6 +545,21 @@ atusb_set_csma_params(struct ieee802154_hw *hw, u8 min_be, u8 max_be, u8 retries
        return atusb_write_subreg(atusb, SR_MAX_CSMA_RETRIES, retries);
 }
 
+static int
+atusb_set_frame_retries(struct ieee802154_hw *hw, s8 retries)
+{
+       struct atusb *atusb = hw->priv;
+       struct device *dev = &atusb->usb_dev->dev;
+
+       if (atusb->fw_ver_maj == 0 && atusb->fw_ver_min < 3) {
+               dev_info(dev, "Automatic frame retransmission is only available from "
+                       "firmware version 0.3. Please update if you want this feature.");
+               return -EINVAL;
+       }
+
+       return atusb_write_subreg(atusb, SR_MAX_FRAME_RETRIES, retries);
+}
+
 static int
 atusb_set_promiscuous_mode(struct ieee802154_hw *hw, const bool on)
 {
@@ -584,6 +599,7 @@ static const struct ieee802154_ops atusb_ops = {
        .set_cca_mode           = atusb_set_cca_mode,
        .set_cca_ed_level       = atusb_set_cca_ed_level,
        .set_csma_params        = atusb_set_csma_params,
+       .set_frame_retries      = atusb_set_frame_retries,
        .set_promiscuous_mode   = atusb_set_promiscuous_mode,
 };
 
@@ -754,7 +770,8 @@ static int atusb_probe(struct usb_interface *interface,
 
        hw->parent = &usb_dev->dev;
        hw->flags = IEEE802154_HW_TX_OMIT_CKSUM | IEEE802154_HW_AFILT |
-                   IEEE802154_HW_PROMISCUOUS | IEEE802154_HW_CSMA_PARAMS;
+                   IEEE802154_HW_PROMISCUOUS | IEEE802154_HW_CSMA_PARAMS |
+                   IEEE802154_HW_FRAME_RETRIES;
 
        hw->phy->flags = WPAN_PHY_FLAG_TXPOWER | WPAN_PHY_FLAG_CCA_ED_LEVEL |
                         WPAN_PHY_FLAG_CCA_MODE;