ieee802154: remove nl802154 unused functions

The include/net/nl802154.h file contains a lot of prototypes which are
not used inside of ieee802154 subsystem. This patch removes this file
and make the only one used prototype "ieee802154_nl_start_confirm" as
static declaration in ieee802154/nl-mac.c

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

2 files changed, 6 insertions, 187 deletions

diff --git a/net/ieee802154/nl-mac.c b/net/ieee802154/nl-mac.c
index cc2919dbe5e0..91a1855e521c 100644
--- a/net/ieee802154/nl-mac.c
+++ b/net/ieee802154/nl-mac.c
@@ -29,7 +29,6 @@
 #include <linux/nl802154.h>
 #include <linux/export.h>
 #include <net/af_ieee802154.h>
-#include <net/nl802154.h>
 #include <net/ieee802154_netdev.h>
 #include <net/cfg802154.h>
 
@@ -55,186 +54,7 @@ static __le16 nla_get_shortaddr(const struct nlattr *nla)
         return cpu_to_le16(nla_get_u16(nla));
 }
 
-int ieee802154_nl_assoc_indic(struct net_device *dev,
-                              struct ieee802154_addr *addr,
-                              u8 cap)
-{
-        struct sk_buff *msg;
-
-        pr_debug("%s\n", __func__);
-
-        if (addr->mode != IEEE802154_ADDR_LONG) {
-                pr_err("%s: received non-long source address!\n", __func__);
-                return -EINVAL;
-        }
-
-        msg = ieee802154_nl_create(0, IEEE802154_ASSOCIATE_INDIC);
-        if (!msg)
-                return -ENOBUFS;
-
-        if (nla_put_string(msg, IEEE802154_ATTR_DEV_NAME, dev->name) ||
-            nla_put_u32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex) ||
-            nla_put(msg, IEEE802154_ATTR_HW_ADDR, IEEE802154_ADDR_LEN,
-                    dev->dev_addr) ||
-            nla_put_hwaddr(msg, IEEE802154_ATTR_SRC_HW_ADDR,
-                           addr->extended_addr) ||
-            nla_put_u8(msg, IEEE802154_ATTR_CAPABILITY, cap))
-                goto nla_put_failure;
-
-        return ieee802154_nl_mcast(msg, IEEE802154_COORD_MCGRP);
-
-nla_put_failure:
-        nlmsg_free(msg);
-        return -ENOBUFS;
-}
-EXPORT_SYMBOL(ieee802154_nl_assoc_indic);
-
-int ieee802154_nl_assoc_confirm(struct net_device *dev, __le16 short_addr,
-                                u8 status)
-{
-        struct sk_buff *msg;
-
-        pr_debug("%s\n", __func__);
-
-        msg = ieee802154_nl_create(0, IEEE802154_ASSOCIATE_CONF);
-        if (!msg)
-                return -ENOBUFS;
-
-        if (nla_put_string(msg, IEEE802154_ATTR_DEV_NAME, dev->name) ||
-            nla_put_u32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex) ||
-            nla_put(msg, IEEE802154_ATTR_HW_ADDR, IEEE802154_ADDR_LEN,
-                    dev->dev_addr) ||
-            nla_put_shortaddr(msg, IEEE802154_ATTR_SHORT_ADDR, short_addr) ||
-            nla_put_u8(msg, IEEE802154_ATTR_STATUS, status))
-                goto nla_put_failure;
-        return ieee802154_nl_mcast(msg, IEEE802154_COORD_MCGRP);
-
-nla_put_failure:
-        nlmsg_free(msg);
-        return -ENOBUFS;
-}
-EXPORT_SYMBOL(ieee802154_nl_assoc_confirm);
-
-int ieee802154_nl_disassoc_indic(struct net_device *dev,
-                                 struct ieee802154_addr *addr,
-                                 u8 reason)
-{
-        struct sk_buff *msg;
-
-        pr_debug("%s\n", __func__);
-
-        msg = ieee802154_nl_create(0, IEEE802154_DISASSOCIATE_INDIC);
-        if (!msg)
-                return -ENOBUFS;
-
-        if (nla_put_string(msg, IEEE802154_ATTR_DEV_NAME, dev->name) ||
-            nla_put_u32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex) ||
-            nla_put(msg, IEEE802154_ATTR_HW_ADDR, IEEE802154_ADDR_LEN,
-                    dev->dev_addr))
-                goto nla_put_failure;
-        if (addr->mode == IEEE802154_ADDR_LONG) {
-                if (nla_put_hwaddr(msg, IEEE802154_ATTR_SRC_HW_ADDR,
-                                   addr->extended_addr))
-                        goto nla_put_failure;
-        } else {
-                if (nla_put_shortaddr(msg, IEEE802154_ATTR_SRC_SHORT_ADDR,
-                                      addr->short_addr))
-                        goto nla_put_failure;
-        }
-        if (nla_put_u8(msg, IEEE802154_ATTR_REASON, reason))
-                goto nla_put_failure;
-        return ieee802154_nl_mcast(msg, IEEE802154_COORD_MCGRP);
-
-nla_put_failure:
-        nlmsg_free(msg);
-        return -ENOBUFS;
-}
-EXPORT_SYMBOL(ieee802154_nl_disassoc_indic);
-
-int ieee802154_nl_disassoc_confirm(struct net_device *dev, u8 status)
-{
-        struct sk_buff *msg;
-
-        pr_debug("%s\n", __func__);
-
-        msg = ieee802154_nl_create(0, IEEE802154_DISASSOCIATE_CONF);
-        if (!msg)
-                return -ENOBUFS;
-
-        if (nla_put_string(msg, IEEE802154_ATTR_DEV_NAME, dev->name) ||
-            nla_put_u32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex) ||
-            nla_put(msg, IEEE802154_ATTR_HW_ADDR, IEEE802154_ADDR_LEN,
-                    dev->dev_addr) ||
-            nla_put_u8(msg, IEEE802154_ATTR_STATUS, status))
-                goto nla_put_failure;
-        return ieee802154_nl_mcast(msg, IEEE802154_COORD_MCGRP);
-
-nla_put_failure:
-        nlmsg_free(msg);
-        return -ENOBUFS;
-}
-EXPORT_SYMBOL(ieee802154_nl_disassoc_confirm);
-
-int ieee802154_nl_beacon_indic(struct net_device *dev, __le16 panid,
-                               __le16 coord_addr)
-{
-        struct sk_buff *msg;
-
-        pr_debug("%s\n", __func__);
-
-        msg = ieee802154_nl_create(0, IEEE802154_BEACON_NOTIFY_INDIC);
-        if (!msg)
-                return -ENOBUFS;
-
-        if (nla_put_string(msg, IEEE802154_ATTR_DEV_NAME, dev->name) ||
-            nla_put_u32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex) ||
-            nla_put(msg, IEEE802154_ATTR_HW_ADDR, IEEE802154_ADDR_LEN,
-                    dev->dev_addr) ||
-            nla_put_shortaddr(msg, IEEE802154_ATTR_COORD_SHORT_ADDR,
-                              coord_addr) ||
-            nla_put_shortaddr(msg, IEEE802154_ATTR_COORD_PAN_ID, panid))
-                goto nla_put_failure;
-        return ieee802154_nl_mcast(msg, IEEE802154_COORD_MCGRP);
-
-nla_put_failure:
-        nlmsg_free(msg);
-        return -ENOBUFS;
-}
-EXPORT_SYMBOL(ieee802154_nl_beacon_indic);
-
-int ieee802154_nl_scan_confirm(struct net_device *dev,
-                               u8 status, u8 scan_type,
-                               u32 unscanned, u8 page,
-                               u8 *edl/* , struct list_head *pan_desc_list */)
-{
-        struct sk_buff *msg;
-
-        pr_debug("%s\n", __func__);
-
-        msg = ieee802154_nl_create(0, IEEE802154_SCAN_CONF);
-        if (!msg)
-                return -ENOBUFS;
-
-        if (nla_put_string(msg, IEEE802154_ATTR_DEV_NAME, dev->name) ||
-            nla_put_u32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex) ||
-            nla_put(msg, IEEE802154_ATTR_HW_ADDR, IEEE802154_ADDR_LEN,
-                    dev->dev_addr) ||
-            nla_put_u8(msg, IEEE802154_ATTR_STATUS, status) ||
-            nla_put_u8(msg, IEEE802154_ATTR_SCAN_TYPE, scan_type) ||
-            nla_put_u32(msg, IEEE802154_ATTR_CHANNELS, unscanned) ||
-            nla_put_u8(msg, IEEE802154_ATTR_PAGE, page) ||
-            (edl &&
-             nla_put(msg, IEEE802154_ATTR_ED_LIST, 27, edl)))
-                goto nla_put_failure;
-        return ieee802154_nl_mcast(msg, IEEE802154_COORD_MCGRP);
-
-nla_put_failure:
-        nlmsg_free(msg);
-        return -ENOBUFS;
-}
-EXPORT_SYMBOL(ieee802154_nl_scan_confirm);
-
-int ieee802154_nl_start_confirm(struct net_device *dev, u8 status)
+static int ieee802154_nl_start_confirm(struct net_device *dev, u8 status)
 {
         struct sk_buff *msg;
 
@@ -530,6 +350,11 @@ int ieee802154_start_req(struct sk_buff *skb, struct genl_info *info)
         ret = ieee802154_mlme_ops(dev)->start_req(dev, &addr, channel, page,
                 bcn_ord, sf_ord, pan_coord, blx, coord_realign);
 
+        /* FIXME: add validation for unused parameters to be sane
+         * for SoftMAC
+         */
+        ieee802154_nl_start_confirm(dev, IEEE802154_SUCCESS);
+
 out:
         dev_put(dev);
         return ret;
diff --git a/net/mac802154/mac_cmd.c b/net/mac802154/mac_cmd.c
index 9c2d6f61f194..e1ad83e35899 100644
--- a/net/mac802154/mac_cmd.c
+++ b/net/mac802154/mac_cmd.c
@@ -25,7 +25,6 @@
 #include <net/ieee802154_netdev.h>
 #include <net/cfg802154.h>
 #include <net/mac802154.h>
-#include <net/nl802154.h>
 
 #include "ieee802154_i.h"
 #include "driver-ops.h"
@@ -65,11 +64,6 @@ static int mac802154_mlme_start_req(struct net_device *dev,
                 rc = ops->llsec->set_params(dev, &params, changed);
         }
 
-        /* FIXME: add validation for unused parameters to be sane
-         * for SoftMAC
-         */
-        ieee802154_nl_start_confirm(dev, IEEE802154_SUCCESS);
-
         return rc;
 }