Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-12-30 14:22:37 +01:00
Code Releases Activity

netdev: Rework link_mode and operstate setting

Browse Source 
These flags are documented in RFC2863 and kernel's
Documentation/networking/operstates.txt.  Operstate doesn't have any
siginificant effect on normal connectivity or on our autotests because
it is not used by the kernel except in some rare cases but it is
supposed to affect some userspace daemons that watch for RTM_NEWLINK
events, so I believe we *should* set them according to this
documentation.  Changes:

* There's no point setting link_mode or operstate of the netdev when
  we're bringing the admin state DOWN as that overrides operstate.

* Instead of numerical values for link_mode use the if.h defines.

* Set IF_OPER_UP when association succeeds also in the Fast Transition
  case.  The driver will have set carrier off and then on so the
  operstate should be IF_OPER_DORMANT at this point and needs to be
  reset to UP.
This commit is contained in:
Andrew Zaborowski 2017-05-30 14:26:18 +02:00 committed by Denis Kenzior
parent 49930c6d77
commit 4d20db05d7
1 changed files with 20 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/netdev.c
View File

@ -279,20 +279,13 @@ int netdev_set_powered(struct netdev *netdev, bool powered,
return 0; return 0;
} }
static void netdev_operstate_dormant_cb(bool success, void *user_data) static void netdev_linkmode_dormant_cb(bool success, void *user_data)
{ {
struct netdev *netdev = user_data; struct netdev *netdev = user_data;
l_debug("netdev: %d, success: %d", netdev->index, success); l_debug("netdev: %d, success: %d", netdev->index, success);
} }
static void netdev_operstate_down_cb(bool success, void *user_data)
{
uint32_t index = L_PTR_TO_UINT(user_data);
l_debug("netdev: %d, success: %d", index, success);
}
static void netdev_preauth_destroy(void *data) static void netdev_preauth_destroy(void *data)
{ {
struct netdev_preauth_state *state = data; struct netdev_preauth_state *state = data;
@ -420,10 +413,6 @@ static void netdev_shutdown_one(void *data, void *user_data)
{ {
struct netdev *netdev = data; struct netdev *netdev = data;
netdev_set_linkmode_and_operstate(netdev->index, 0, IF_OPER_DOWN,
netdev_operstate_down_cb,
L_UINT_TO_PTR(netdev->index));
if (netdev_get_is_up(netdev)) if (netdev_get_is_up(netdev))
netdev_set_powered(netdev, false, NULL, NULL, NULL); netdev_set_powered(netdev, false, NULL, NULL, NULL);
} }
@ -797,8 +786,9 @@ static void netdev_set_station_cb(struct l_genl_msg *msg, void *user_data)
return; return;
} }
netdev_set_linkmode_and_operstate(netdev->index, 1, IF_OPER_UP, netdev_set_linkmode_and_operstate(netdev->index, IF_LINK_MODE_DORMANT,
netdev_operstate_cb, netdev); IF_OPER_UP, netdev_operstate_cb,
netdev);
} }
static struct l_genl_msg *netdev_build_cmd_set_station(struct netdev *netdev) static struct l_genl_msg *netdev_build_cmd_set_station(struct netdev *netdev)
@ -1454,30 +1444,29 @@ static void netdev_connect_event(struct l_genl_msg *msg,
* has all the input data even in FT mode. * has all the input data even in FT mode.
*/ */
eapol_start(netdev->sm); eapol_start(netdev->sm);
if (!netdev->in_ft) {
if (netdev->event_filter)
netdev->event_filter(netdev,
NETDEV_EVENT_4WAY_HANDSHAKE,
netdev->user_data);
return;
}
} }
if (netdev->in_ft) { if (netdev->in_ft) {
bool is_rsn = netdev->handshake->own_ie != NULL; bool is_rsn = netdev->handshake->own_ie != NULL;
netdev->in_ft = false; netdev->in_ft = false;
netdev->operational = true;
if (is_rsn) if (is_rsn)
handshake_state_install_ptk(netdev->handshake); handshake_state_install_ptk(netdev->handshake);
}
if (netdev->connect_cb) { netdev_set_linkmode_and_operstate(netdev->index, IF_LINK_MODE_DORMANT,
netdev->connect_cb(netdev, NETDEV_RESULT_OK, IF_OPER_UP, netdev_operstate_cb,
netdev->user_data); netdev);
netdev->connect_cb = NULL;
}
} else if (netdev->sm) {
if (netdev->event_filter)
netdev->event_filter(netdev,
NETDEV_EVENT_4WAY_HANDSHAKE,
netdev->user_data);
} else
netdev_set_linkmode_and_operstate(netdev->index, 1, IF_OPER_UP,
netdev_operstate_cb, netdev);
return; return;
@ -2997,9 +2986,9 @@ static void netdev_initial_up_cb(struct netdev *netdev, int result,
return; return;
} }
netdev_set_linkmode_and_operstate(netdev->index, 1, netdev_set_linkmode_and_operstate(netdev->index, IF_LINK_MODE_DORMANT,
IF_OPER_DORMANT, IF_OPER_DOWN,
netdev_operstate_dormant_cb, netdev_linkmode_dormant_cb,
netdev); netdev);
l_debug("Interface %i initialized", netdev->index); l_debug("Interface %i initialized", netdev->index);