Emulation/switch-linux
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-linux.git synced 2025-05-04 02:34:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

6lowpan: add lowpan dev register helpers

Browse source 
This patch introduces register and unregister functionality for lowpan
interfaces. While register a lowpan interface there are several things
which need to be initialize by the 6lowpan subsystem. Upcoming
functionality need to register/unregister per interface components e.g.
debugfs entry.

Reviewed-by: Stefan Schmidt <stefan@osg.samsung.com>
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Alexander Aring 2015-12-09 22:46:29 +01:00 • committed by Marcel Holtmann
parent 43f26e17d0
commit 00f5931411
4 changed files with 42 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/net/6lowpan.h
View file

@ -185,7 +185,12 @@ static inline void lowpan_push_hc_data(u8 **hc_ptr, const void *data,
*hc_ptr += len; *hc_ptr += len;
} }
void lowpan_netdev_setup(struct net_device *dev, enum lowpan_lltypes lltype); int lowpan_register_netdevice(struct net_device *dev,
enum lowpan_lltypes lltype);
int lowpan_register_netdev(struct net_device *dev,
enum lowpan_lltypes lltype);
void lowpan_unregister_netdevice(struct net_device *dev);
void lowpan_unregister_netdev(struct net_device *dev);
/** /**
* lowpan_header_decompress - replace 6LoWPAN header with IPv6 header * lowpan_header_decompress - replace 6LoWPAN header with IPv6 header

33
net/6lowpan/core.c
View file

@ -15,7 +15,8 @@
#include <net/6lowpan.h> #include <net/6lowpan.h>
void lowpan_netdev_setup(struct net_device *dev, enum lowpan_lltypes lltype) int lowpan_register_netdevice(struct net_device *dev,
enum lowpan_lltypes lltype)
{ {
dev->addr_len = EUI64_ADDR_LEN; dev->addr_len = EUI64_ADDR_LEN;
dev->type = ARPHRD_6LOWPAN; dev->type = ARPHRD_6LOWPAN;
@ -23,8 +24,36 @@ void lowpan_netdev_setup(struct net_device *dev, enum lowpan_lltypes lltype)
dev->priv_flags |= IFF_NO_QUEUE; dev->priv_flags |= IFF_NO_QUEUE;
lowpan_priv(dev)->lltype = lltype; lowpan_priv(dev)->lltype = lltype;
return register_netdevice(dev);
} }
EXPORT_SYMBOL(lowpan_netdev_setup); EXPORT_SYMBOL(lowpan_register_netdevice);
int lowpan_register_netdev(struct net_device *dev,
enum lowpan_lltypes lltype)
{
int ret;
rtnl_lock();
ret = lowpan_register_netdevice(dev, lltype);
rtnl_unlock();
return ret;
}
EXPORT_SYMBOL(lowpan_register_netdev);
void lowpan_unregister_netdevice(struct net_device *dev)
{
unregister_netdevice(dev);
}
EXPORT_SYMBOL(lowpan_unregister_netdevice);
void lowpan_unregister_netdev(struct net_device *dev)
{
rtnl_lock();
lowpan_unregister_netdevice(dev);
rtnl_unlock();
}
EXPORT_SYMBOL(lowpan_unregister_netdev);
static int __init lowpan_module_init(void) static int __init lowpan_module_init(void)
{ {

8
net/bluetooth/6lowpan.c
View file

@ -825,9 +825,7 @@ static int setup_netdev(struct l2cap_chan *chan, struct lowpan_dev **dev)
list_add_rcu(&(*dev)->list, &bt_6lowpan_devices); list_add_rcu(&(*dev)->list, &bt_6lowpan_devices);
spin_unlock(&devices_lock); spin_unlock(&devices_lock);
lowpan_netdev_setup(netdev, LOWPAN_LLTYPE_BTLE); err = lowpan_register_netdev(netdev, LOWPAN_LLTYPE_BTLE);
err = register_netdev(netdev);
if (err < 0) { if (err < 0) {
BT_INFO("register_netdev failed %d", err); BT_INFO("register_netdev failed %d", err);
spin_lock(&devices_lock); spin_lock(&devices_lock);
@ -890,7 +888,7 @@ static void delete_netdev(struct work_struct *work)
struct lowpan_dev *entry = container_of(work, struct lowpan_dev, struct lowpan_dev *entry = container_of(work, struct lowpan_dev,
delete_netdev); delete_netdev);
unregister_netdev(entry->netdev); lowpan_unregister_netdev(entry->netdev);
/* The entry pointer is deleted by the netdev destructor. */ /* The entry pointer is deleted by the netdev destructor. */
} }
@ -1348,7 +1346,7 @@ static void disconnect_devices(void)
ifdown(entry->netdev); ifdown(entry->netdev);
BT_DBG("Unregistering netdev %s %p", BT_DBG("Unregistering netdev %s %p",
entry->netdev->name, entry->netdev); entry->netdev->name, entry->netdev);
unregister_netdev(entry->netdev); lowpan_unregister_netdev(entry->netdev);
kfree(entry); kfree(entry);
} }
} }

6
net/ieee802154/6lowpan/core.c
View file

@ -161,9 +161,7 @@ static int lowpan_newlink(struct net *src_net, struct net_device *ldev,
wdev->needed_headroom; wdev->needed_headroom;
ldev->needed_tailroom = wdev->needed_tailroom; ldev->needed_tailroom = wdev->needed_tailroom;
lowpan_netdev_setup(ldev, LOWPAN_LLTYPE_IEEE802154); ret = lowpan_register_netdevice(ldev, LOWPAN_LLTYPE_IEEE802154);
ret = register_netdevice(ldev);
if (ret < 0) { if (ret < 0) {
dev_put(wdev); dev_put(wdev);
return ret; return ret;
@ -180,7 +178,7 @@ static void lowpan_dellink(struct net_device *ldev, struct list_head *head)
ASSERT_RTNL(); ASSERT_RTNL();
wdev->ieee802154_ptr->lowpan_dev = NULL; wdev->ieee802154_ptr->lowpan_dev = NULL;
unregister_netdevice(ldev); lowpan_unregister_netdevice(ldev);
dev_put(wdev); dev_put(wdev);
} }