ipcpd: Use consistent function naming

For instance ipcp_udp_* vs eth_ipcp_*. Now all functions are
<type>_ipcp_*.

Als cleans up some minor things.

Signed-off-by: Dimitri Staessens <[email protected]>
Signed-off-by: Sander Vrijders <[email protected]>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/ipcpd/eth/eth.c b/src/ipcpd/eth/eth.c
index 6d9d78ba..15082ee3 100644
--- a/src/ipcpd/eth/eth.c
+++ b/src/ipcpd/eth/eth.c
@@ -1829,9 +1829,6 @@ int main(int    argc,
 {
         int i;
 
-        if (ipcp_init(argc, argv, &eth_ops, THIS_TYPE) < 0)
-                goto fail_init;
-
         if (eth_data_init() < 0) {
 #if defined(BUILD_ETH_DIX)
                 log_err("Failed to init eth-llc data.");
@@ -1841,6 +1838,9 @@ int main(int    argc,
                 goto fail_data_init;
         }
 
+        if (ipcp_init(argc, argv, &eth_ops, THIS_TYPE) < 0)
+                goto fail_init;
+
         if (ipcp_start() < 0) {
                 log_err("Failed to start IPCP.");
                 goto fail_start;
@@ -1878,9 +1878,9 @@ int main(int    argc,
         exit(EXIT_SUCCESS);
 
  fail_start:
-        eth_data_fini();
- fail_data_init:
         ipcp_fini();
  fail_init:
+        eth_data_fini();
+ fail_data_init:
         exit(EXIT_FAILURE);
 }