Index: uspace/lib/c/generic/iplink.c =================================================================== --- uspace/lib/c/generic/iplink.c (revision 5a324d992b3382c26e5d9d448d8c857d73a4a6b4) +++ uspace/lib/c/generic/iplink.c (revision 417a2ba1303a424dd9777ac7dc48bfad97e90122) @@ -218,5 +218,5 @@ iplink_recv_sdu_t sdu; - uint16_t af = IPC_GET_ARG1(*icall); + ip_ver_t ver = IPC_GET_ARG1(*icall); int rc = async_data_write_accept(&sdu.data, false, 0, 0, 0, @@ -227,5 +227,5 @@ } - rc = iplink->ev_ops->recv(iplink, &sdu, af); + rc = iplink->ev_ops->recv(iplink, &sdu, ver); free(sdu.data); async_answer_0(iid, rc); Index: uspace/lib/c/generic/iplink_srv.c =================================================================== --- uspace/lib/c/generic/iplink_srv.c (revision 5a324d992b3382c26e5d9d448d8c857d73a4a6b4) +++ uspace/lib/c/generic/iplink_srv.c (revision 417a2ba1303a424dd9777ac7dc48bfad97e90122) @@ -272,5 +272,6 @@ } -int iplink_ev_recv(iplink_srv_t *srv, iplink_recv_sdu_t *sdu, uint16_t af) +/* XXX Version should be part of @a sdu */ +int iplink_ev_recv(iplink_srv_t *srv, iplink_recv_sdu_t *sdu, ip_ver_t ver) { if (srv->client_sess == NULL) @@ -280,5 +281,5 @@ ipc_call_t answer; - aid_t req = async_send_1(exch, IPLINK_EV_RECV, (sysarg_t) af, + aid_t req = async_send_1(exch, IPLINK_EV_RECV, (sysarg_t)ver, &answer); Index: uspace/lib/c/include/inet/iplink.h =================================================================== --- uspace/lib/c/include/inet/iplink.h (revision 5a324d992b3382c26e5d9d448d8c857d73a4a6b4) +++ uspace/lib/c/include/inet/iplink.h (revision 417a2ba1303a424dd9777ac7dc48bfad97e90122) @@ -37,5 +37,4 @@ #include -#include #include @@ -78,5 +77,5 @@ typedef struct iplink_ev_ops { - int (*recv)(iplink_t *, iplink_recv_sdu_t *, uint16_t); + int (*recv)(iplink_t *, iplink_recv_sdu_t *, ip_ver_t); } iplink_ev_ops_t; Index: uspace/lib/c/include/inet/iplink_srv.h =================================================================== --- uspace/lib/c/include/inet/iplink_srv.h (revision 5a324d992b3382c26e5d9d448d8c857d73a4a6b4) +++ uspace/lib/c/include/inet/iplink_srv.h (revision 417a2ba1303a424dd9777ac7dc48bfad97e90122) @@ -39,5 +39,4 @@ #include #include -#include #include #include @@ -67,5 +66,5 @@ extern int iplink_conn(ipc_callid_t, ipc_call_t *, void *); -extern int iplink_ev_recv(iplink_srv_t *, iplink_recv_sdu_t *, uint16_t); +extern int iplink_ev_recv(iplink_srv_t *, iplink_recv_sdu_t *, ip_ver_t); #endif Index: uspace/srv/net/ethip/ethip.c =================================================================== --- uspace/srv/net/ethip/ethip.c (revision 5a324d992b3382c26e5d9d448d8c857d73a4a6b4) +++ uspace/srv/net/ethip/ethip.c (revision 417a2ba1303a424dd9777ac7dc48bfad97e90122) @@ -42,5 +42,4 @@ #include #include -#include #include #include @@ -249,5 +248,5 @@ sdu.size = frame.size; log_msg(LOG_DEFAULT, LVL_DEBUG, " - call iplink_ev_recv"); - rc = iplink_ev_recv(&nic->iplink, &sdu, AF_INET); + rc = iplink_ev_recv(&nic->iplink, &sdu, ip_v4); break; case ETYPE_IPV6: @@ -256,5 +255,5 @@ sdu.size = frame.size; log_msg(LOG_DEFAULT, LVL_DEBUG, " - call iplink_ev_recv"); - rc = iplink_ev_recv(&nic->iplink, &sdu, AF_INET6); + rc = iplink_ev_recv(&nic->iplink, &sdu, ip_v6); break; default: Index: uspace/srv/net/inetsrv/inet_link.c =================================================================== --- uspace/srv/net/inetsrv/inet_link.c (revision 5a324d992b3382c26e5d9d448d8c857d73a4a6b4) +++ uspace/srv/net/inetsrv/inet_link.c (revision 417a2ba1303a424dd9777ac7dc48bfad97e90122) @@ -43,5 +43,4 @@ #include #include -#include #include "addrobj.h" #include "inetsrv.h" @@ -55,5 +54,5 @@ static uint16_t ip_ident = 0; -static int inet_iplink_recv(iplink_t *, iplink_recv_sdu_t *, uint16_t); +static int inet_iplink_recv(iplink_t *, iplink_recv_sdu_t *, ip_ver_t); static inet_link_t *inet_link_get_by_id_locked(sysarg_t); @@ -81,5 +80,5 @@ } -static int inet_iplink_recv(iplink_t *iplink, iplink_recv_sdu_t *sdu, uint16_t af) +static int inet_iplink_recv(iplink_t *iplink, iplink_recv_sdu_t *sdu, ip_ver_t ver) { log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_iplink_recv()"); @@ -88,13 +87,13 @@ inet_packet_t packet; - switch (af) { - case AF_INET: + switch (ver) { + case ip_v4: rc = inet_pdu_decode(sdu->data, sdu->size, &packet); break; - case AF_INET6: + case ip_v6: rc = inet_pdu_decode6(sdu->data, sdu->size, &packet); break; default: - log_msg(LOG_DEFAULT, LVL_DEBUG, "invalid address family"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "invalid IP version"); return EINVAL; } Index: uspace/srv/net/loopip/loopip.c =================================================================== --- uspace/srv/net/loopip/loopip.c (revision 5a324d992b3382c26e5d9d448d8c857d73a4a6b4) +++ uspace/srv/net/loopip/loopip.c (revision 417a2ba1303a424dd9777ac7dc48bfad97e90122) @@ -40,5 +40,4 @@ #include #include -#include #include #include @@ -76,5 +75,6 @@ link_t link; - uint16_t af; + /* XXX Version should be part of SDU */ + ip_ver_t ver; iplink_recv_sdu_t sdu; } rqueue_entry_t; @@ -88,5 +88,5 @@ list_get_instance(link, rqueue_entry_t, link); - (void) iplink_ev_recv(&loopip_iplink, &rqe->sdu, rqe->af); + (void) iplink_ev_recv(&loopip_iplink, &rqe->sdu, rqe->ver); free(rqe->sdu.data); @@ -174,5 +174,5 @@ * Clone SDU */ - rqe->af = AF_INET; + rqe->ver = ip_v4; rqe->sdu.data = malloc(sdu->size); if (rqe->sdu.data == NULL) { @@ -203,5 +203,5 @@ * Clone SDU */ - rqe->af = AF_INET6; + rqe->ver = ip_v6; rqe->sdu.data = malloc(sdu->size); if (rqe->sdu.data == NULL) { Index: uspace/srv/net/slip/slip.c =================================================================== --- uspace/srv/net/slip/slip.c (revision 5a324d992b3382c26e5d9d448d8c857d73a4a6b4) +++ uspace/srv/net/slip/slip.c (revision 417a2ba1303a424dd9777ac7dc48bfad97e90122) @@ -38,5 +38,4 @@ #include #include -#include #include #include @@ -277,5 +276,5 @@ pass: - rc = iplink_ev_recv(&slip_iplink, &sdu, AF_INET); + rc = iplink_ev_recv(&slip_iplink, &sdu, ip_v4); if (rc != EOK) { log_msg(LOG_DEFAULT, LVL_ERROR,