4 files changed, 50 insertions, 0 deletions

diff --git a/net/ieee802154/nl802154.c b/net/ieee802154/nl802154.c
index 49c4d8a5004a..6b9bc93944a6 100644
--- a/net/ieee802154/nl802154.c
+++ b/net/ieee802154/nl802154.c
@@ -583,6 +583,26 @@ static int nl802154_new_interface(struct sk_buff *skb, struct genl_info *info)
                                      type, extended_addr);
 }
 
+static int nl802154_del_interface(struct sk_buff *skb, struct genl_info *info)
+{
+        struct cfg802154_registered_device *rdev = info->user_ptr[0];
+        struct wpan_dev *wpan_dev = info->user_ptr[1];
+
+        if (!rdev->ops->del_virtual_intf)
+                return -EOPNOTSUPP;
+
+        /* If we remove a wpan device without a netdev then clear
+         * user_ptr[1] so that nl802154_post_doit won't dereference it
+         * to check if it needs to do dev_put(). Otherwise it crashes
+         * since the wpan_dev has been freed, unlike with a netdev where
+         * we need the dev_put() for the netdev to really be freed.
+         */
+        if (!wpan_dev->netdev)
+                info->user_ptr[1] = NULL;
+
+        return rdev_del_virtual_intf(rdev, wpan_dev);
+}
+
 static int nl802154_set_channel(struct sk_buff *skb, struct genl_info *info)
 {
         struct cfg802154_registered_device *rdev = info->user_ptr[0];
@@ -859,6 +879,14 @@ static const struct genl_ops nl802154_ops[] = {
                                   NL802154_FLAG_NEED_RTNL,
         },
         {
+                .cmd = NL802154_CMD_DEL_INTERFACE,
+                .doit = nl802154_del_interface,
+                .policy = nl802154_policy,
+                .flags = GENL_ADMIN_PERM,
+                .internal_flags = NL802154_FLAG_NEED_WPAN_DEV |
+                                  NL802154_FLAG_NEED_RTNL,
+        },
+        {
                 .cmd = NL802154_CMD_SET_CHANNEL,
                 .doit = nl802154_set_channel,
                 .policy = nl802154_policy,
diff --git a/net/ieee802154/rdev-ops.h b/net/ieee802154/rdev-ops.h
index 06e97542dafb..40ffbc0d8b85 100644
--- a/net/ieee802154/rdev-ops.h
+++ b/net/ieee802154/rdev-ops.h
@@ -29,6 +29,13 @@ rdev_add_virtual_intf(struct cfg802154_registered_device *rdev, char *name,
 }
 
 static inline int
+rdev_del_virtual_intf(struct cfg802154_registered_device *rdev,
+                      struct wpan_dev *wpan_dev)
+{
+        return rdev->ops->del_virtual_intf(&rdev->wpan_phy, wpan_dev);
+}
+
+static inline int
 rdev_set_channel(struct cfg802154_registered_device *rdev, u8 page, u8 channel)
 {
         return rdev->ops->set_channel(&rdev->wpan_phy, page, channel);
diff --git a/net/mac802154/cfg.c b/net/mac802154/cfg.c
index 568d712bfc8c..7def2625eaca 100644
--- a/net/mac802154/cfg.c
+++ b/net/mac802154/cfg.c
@@ -58,6 +58,14 @@ ieee802154_add_iface(struct wpan_phy *phy, const char *name,
 }
 
 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)
 {
         struct ieee802154_local *local = wpan_phy_priv(wpan_phy);
@@ -191,6 +199,7 @@ 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_pan_id = ieee802154_set_pan_id,
         .set_short_addr = ieee802154_set_short_addr,
diff --git a/net/mac802154/ieee802154_i.h b/net/mac802154/ieee802154_i.h
index cc691637d24b..bebd70ffc7a3 100644
--- a/net/mac802154/ieee802154_i.h
+++ b/net/mac802154/ieee802154_i.h
@@ -115,6 +115,12 @@ IEEE802154_DEV_TO_SUB_IF(const struct net_device *dev)
         return netdev_priv(dev);
 }
 
+static inline struct ieee802154_sub_if_data *
+IEEE802154_WPAN_DEV_TO_SUB_IF(struct wpan_dev *wpan_dev)
+{
+        return container_of(wpan_dev, struct ieee802154_sub_if_data, wpan_dev);
+}
+
 static inline bool
 ieee802154_sdata_running(struct ieee802154_sub_if_data *sdata)
 {