Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-19 02:39:29 +01:00
Code Releases Activity

netdev: use rtnlutil for linkmode/operstate

Browse Source
This commit is contained in:
Tim Kourt 2019-05-06 11:17:53 -07:00 committed by Denis Kenzior
parent 5104e6752f
commit e282d1fedf
1 changed files with 7 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/netdev.c
View File

@ -61,6 +61,7 @@
#include "src/owe.h" #include "src/owe.h"
#include "src/fils.h" #include "src/fils.h"
#include "src/auth-proto.h" #include "src/auth-proto.h"
#include "src/rtnlutil.h"
#ifndef ENOTSUPP #ifndef ENOTSUPP
#define ENOTSUPP 524 #define ENOTSUPP 524
@ -245,50 +246,6 @@ struct wiphy *netdev_get_wiphy(struct netdev *netdev)
return netdev->wiphy; return netdev->wiphy;
} }
static size_t rta_add_u8(void *rta_buf, unsigned short type, uint8_t value)
{
struct rtattr *rta = rta_buf;
rta->rta_len = RTA_LENGTH(sizeof(uint8_t));
rta->rta_type = type;
*((uint8_t *) RTA_DATA(rta)) = value;
return RTA_SPACE(sizeof(uint8_t));
}
static uint32_t rtnl_set_linkmode_and_operstate(int ifindex,
uint8_t linkmode, uint8_t operstate,
l_netlink_command_func_t cb,
void *user_data,
l_netlink_destroy_func_t destroy)
{
struct ifinfomsg *rtmmsg;
void *rta_buf;
size_t bufsize;
uint32_t id;
bufsize = NLMSG_ALIGN(sizeof(struct ifinfomsg)) +
RTA_SPACE(sizeof(uint8_t)) + RTA_SPACE(sizeof(uint8_t));
rtmmsg = l_malloc(bufsize);
memset(rtmmsg, 0, bufsize);
rtmmsg->ifi_family = AF_UNSPEC;
rtmmsg->ifi_index = ifindex;
rta_buf = (void *) rtmmsg + NLMSG_ALIGN(sizeof(struct ifinfomsg));
rta_buf += rta_add_u8(rta_buf, IFLA_LINKMODE, linkmode);
rta_buf += rta_add_u8(rta_buf, IFLA_OPERSTATE, operstate);
id = l_netlink_send(rtnl, RTM_SETLINK, 0, rtmmsg,
rta_buf - (void *) rtmmsg,
cb, user_data, destroy);
l_free(rtmmsg);
return id;
}
const uint8_t *netdev_get_address(struct netdev *netdev) const uint8_t *netdev_get_address(struct netdev *netdev)
{ {
return netdev->addr; return netdev->addr;
@ -1049,8 +1006,9 @@ static void netdev_operstate_cb(int error, uint16_t type,
static void netdev_connect_ok(struct netdev *netdev) static void netdev_connect_ok(struct netdev *netdev)
{ {
rtnl_set_linkmode_and_operstate(netdev->index, IF_LINK_MODE_DORMANT, rtnl_set_linkmode_and_operstate(rtnl, netdev->index,
IF_OPER_UP, netdev_operstate_cb, IF_LINK_MODE_DORMANT, IF_OPER_UP,
netdev_operstate_cb,
L_UINT_TO_PTR(netdev->index), NULL); L_UINT_TO_PTR(netdev->index), NULL);
netdev->operational = true; netdev->operational = true;
@ -4605,8 +4563,9 @@ static void netdev_initial_up_cb(int error, uint16_t type, const void *data,
return; return;
} }
rtnl_set_linkmode_and_operstate(netdev->index, IF_LINK_MODE_DORMANT, rtnl_set_linkmode_and_operstate(rtnl, netdev->index,
IF_OPER_DOWN, netdev_operstate_cb, IF_LINK_MODE_DORMANT, IF_OPER_DOWN,
netdev_operstate_cb,
L_UINT_TO_PTR(netdev->index), NULL); L_UINT_TO_PTR(netdev->index), NULL);
/* /*