Bluetooth: Add legacy SMP tests

[deliverable/linux.git] / net / mac802154 / cfg.c

diff --git a/net/mac802154/cfg.c b/net/mac802154/cfg.c
index 568d712bfc8caff711bdb1b78b2274fcc0371af2..7d31da503dcfcd24d00826d24b121228075ced35 100644 (file)
--- a/net/mac802154/cfg.c
+++ b/net/mac802154/cfg.c
@@ -57,6 +57,14 @@ ieee802154_add_iface(struct wpan_phy *phy, const char *name,
        return 0;
 }
 
+static int
+ieee802154_del_iface(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev)
+{
+       ieee802154_if_remove(IEEE802154_WPAN_DEV_TO_SUB_IF(wpan_dev));
+
+       return 0;
+}
+
 static int
 ieee802154_set_channel(struct wpan_phy *wpan_phy, u8 page, u8 channel)
 {
@@ -78,9 +86,29 @@ ieee802154_set_channel(struct wpan_phy *wpan_phy, u8 page, u8 channel)
        return ret;
 }
 
+static int
+ieee802154_set_cca_mode(struct wpan_phy *wpan_phy,
+                       const struct wpan_phy_cca *cca)
+{
+       struct ieee802154_local *local = wpan_phy_priv(wpan_phy);
+       int ret;
+
+       ASSERT_RTNL();
+
+       /* check if phy support this setting */
+       if (!(local->hw.flags & IEEE802154_HW_CCA_MODE))
+               return -EOPNOTSUPP;
+
+       ret = drv_set_cca_mode(local, cca);
+       if (!ret)
+               wpan_phy->cca = *cca;
+
+       return ret;
+}
+
 static int
 ieee802154_set_pan_id(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev,
-                     u16 pan_id)
+                     __le16 pan_id)
 {
        ASSERT_RTNL();
 
@@ -91,10 +119,10 @@ ieee802154_set_pan_id(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev,
         *
         * This could useful to simple deassociate an device.
         */
-       if (pan_id == IEEE802154_PAN_ID_BROADCAST)
+       if (pan_id == cpu_to_le16(IEEE802154_PAN_ID_BROADCAST))
                return -EINVAL;
 
-       wpan_dev->pan_id = cpu_to_le16(pan_id);
+       wpan_dev->pan_id = pan_id;
        return 0;
 }
 
@@ -117,7 +145,7 @@ ieee802154_set_backoff_exponent(struct wpan_phy *wpan_phy,
 
 static int
 ieee802154_set_short_addr(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev,
-                         u16 short_addr)
+                         __le16 short_addr)
 {
        ASSERT_RTNL();
 
@@ -132,11 +160,11 @@ ieee802154_set_short_addr(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev,
         * I think we should allow to set these settings but
         * don't allow to allow socket communication with it.
         */
-       if (short_addr == IEEE802154_ADDR_SHORT_UNSPEC ||
-           short_addr == IEEE802154_ADDR_SHORT_BROADCAST)
+       if (short_addr == cpu_to_le16(IEEE802154_ADDR_SHORT_UNSPEC) ||
+           short_addr == cpu_to_le16(IEEE802154_ADDR_SHORT_BROADCAST))
                return -EINVAL;
 
-       wpan_dev->short_addr = cpu_to_le16(short_addr);
+       wpan_dev->short_addr = short_addr;
        return 0;
 }
 
@@ -191,7 +219,9 @@ const struct cfg802154_ops mac802154_config_ops = {
        .add_virtual_intf_deprecated = ieee802154_add_iface_deprecated,
        .del_virtual_intf_deprecated = ieee802154_del_iface_deprecated,
        .add_virtual_intf = ieee802154_add_iface,
+       .del_virtual_intf = ieee802154_del_iface,
        .set_channel = ieee802154_set_channel,
+       .set_cca_mode = ieee802154_set_cca_mode,
        .set_pan_id = ieee802154_set_pan_id,
        .set_short_addr = ieee802154_set_short_addr,
        .set_backoff_exponent = ieee802154_set_backoff_exponent,