diff options
author | Alexander Aring <alex.aring@gmail.com> | 2014-11-17 02:20:53 -0500 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2014-11-17 03:49:17 -0500 |
commit | b821ecd4c8a0b3b1fc1bdd191bb7d555d818cafe (patch) | |
tree | c8f3ac6ef58c923437e200b7d96b6c7987576dd7 /net/mac802154 | |
parent | 0e57547eb7f0aa99aba32b50c49dbd722a80d6fb (diff) |
ieee802154: add del interface command
This patch adds support for deleting a wpan interface via nl802154.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/mac802154')
-rw-r--r-- | net/mac802154/cfg.c | 9 | ||||
-rw-r--r-- | net/mac802154/ieee802154_i.h | 6 |
2 files changed, 15 insertions, 0 deletions
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, | |||
58 | } | 58 | } |
59 | 59 | ||
60 | static int | 60 | static int |
61 | ieee802154_del_iface(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev) | ||
62 | { | ||
63 | ieee802154_if_remove(IEEE802154_WPAN_DEV_TO_SUB_IF(wpan_dev)); | ||
64 | |||
65 | return 0; | ||
66 | } | ||
67 | |||
68 | static int | ||
61 | ieee802154_set_channel(struct wpan_phy *wpan_phy, u8 page, u8 channel) | 69 | ieee802154_set_channel(struct wpan_phy *wpan_phy, u8 page, u8 channel) |
62 | { | 70 | { |
63 | struct ieee802154_local *local = wpan_phy_priv(wpan_phy); | 71 | struct ieee802154_local *local = wpan_phy_priv(wpan_phy); |
@@ -191,6 +199,7 @@ const struct cfg802154_ops mac802154_config_ops = { | |||
191 | .add_virtual_intf_deprecated = ieee802154_add_iface_deprecated, | 199 | .add_virtual_intf_deprecated = ieee802154_add_iface_deprecated, |
192 | .del_virtual_intf_deprecated = ieee802154_del_iface_deprecated, | 200 | .del_virtual_intf_deprecated = ieee802154_del_iface_deprecated, |
193 | .add_virtual_intf = ieee802154_add_iface, | 201 | .add_virtual_intf = ieee802154_add_iface, |
202 | .del_virtual_intf = ieee802154_del_iface, | ||
194 | .set_channel = ieee802154_set_channel, | 203 | .set_channel = ieee802154_set_channel, |
195 | .set_pan_id = ieee802154_set_pan_id, | 204 | .set_pan_id = ieee802154_set_pan_id, |
196 | .set_short_addr = ieee802154_set_short_addr, | 205 | .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) | |||
115 | return netdev_priv(dev); | 115 | return netdev_priv(dev); |
116 | } | 116 | } |
117 | 117 | ||
118 | static inline struct ieee802154_sub_if_data * | ||
119 | IEEE802154_WPAN_DEV_TO_SUB_IF(struct wpan_dev *wpan_dev) | ||
120 | { | ||
121 | return container_of(wpan_dev, struct ieee802154_sub_if_data, wpan_dev); | ||
122 | } | ||
123 | |||
118 | static inline bool | 124 | static inline bool |
119 | ieee802154_sdata_running(struct ieee802154_sub_if_data *sdata) | 125 | ieee802154_sdata_running(struct ieee802154_sub_if_data *sdata) |
120 | { | 126 | { |