Skip to content

Commit

Permalink
nanny: Rename virtual to factory apply policy func.
Browse files Browse the repository at this point in the history
  • Loading branch information
wipawel committed Jul 9, 2014
1 parent 970fee1 commit 5bb8792
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions nanny/device.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
static const char * ni_managed_device_get_essid(xml_node_t *);

static void ni_managed_device_up(ni_managed_device_t *, const char *);
static void ni_virtual_device_up(ni_fsm_t *, ni_ifworker_t *);
static void ni_factory_device_up(ni_fsm_t *, ni_ifworker_t *);

/*
* List handling functions
Expand Down Expand Up @@ -132,7 +132,7 @@ ni_managed_device_set_security_id(ni_managed_device_t *mdev, const ni_security_i
}

static void
ni_virtual_device_up(ni_fsm_t *fsm, ni_ifworker_t *w)
ni_factory_device_up(ni_fsm_t *fsm, ni_ifworker_t *w)
{
ni_ifworker_array_t ifmarked;

Expand All @@ -153,13 +153,13 @@ ni_virtual_device_up(ni_fsm_t *fsm, ni_ifworker_t *w)
* Apply policy to a virtual (factory) device
*/
void
ni_virtual_device_apply_policy(ni_fsm_t *fsm, ni_ifworker_t *w, ni_managed_policy_t *mpolicy)
ni_factory_device_apply_policy(ni_fsm_t *fsm, ni_ifworker_t *w, ni_managed_policy_t *mpolicy)
{
const char *type_name;
const ni_fsm_policy_t *policy = mpolicy->fsm_policy;
xml_node_t *config = NULL;

ni_debug_nanny("%s: creating device using policy %s",
ni_debug_nanny("%s: configuring factory device using policy %s",
w->name, ni_fsm_policy_name(policy));

/* This returns "modem" or "interface" */
Expand All @@ -180,7 +180,7 @@ ni_virtual_device_apply_policy(ni_fsm_t *fsm, ni_ifworker_t *w, ni_managed_polic
ni_ifworker_set_config(w, config, ni_fsm_policy_get_origin(policy));

/* Now do the fandango */
ni_virtual_device_up(fsm, w);
ni_factory_device_up(fsm, w);
}


Expand Down

0 comments on commit 5bb8792

Please sign in to comment.