Index: uspace/lib/net/include/protocol_map.h
===================================================================
--- uspace/lib/net/include/protocol_map.h	(revision 849ed54afbef3ad0ec3af831e93a1353f9eaaf0f)
+++ uspace/lib/net/include/protocol_map.h	(revision 018d79b84a1807df9af40b1bc9f07660b929a662)
@@ -27,16 +27,15 @@
  */
 
-/** @addtogroup net_nil
- *  @{
+/** @addtogroup libnet
+ * @{
  */
 
 /** @file
- *  Internetwork layer services - network interface layer service type translation.
+ * Internetwork layer services - network interface layer service type
+ * translation.
  */
 
-#ifndef __NET_PROTOCOL_MAP_H__
-#define __NET_PROTOCOL_MAP_H__
-
-#include <ipc/services.h>
+#ifndef LIBNET_PROTOCOL_MAP_H_
+#define LIBNET_PROTOCOL_MAP_H_
 
 #include <ethernet_lsap.h>
@@ -44,96 +43,11 @@
 #include <net_hardware.h>
 
-/** Maps the internetwork layer service to the network interface layer type.
- *  @param[in] nil Network interface layer service.
- *  @param[in] il Internetwork layer service.
- *  @returns Network interface layer type of the internetworking layer service.
- *  @returns 0 if mapping is not found.
- */
-static inline eth_type_t protocol_map(services_t nil, services_t il){
-	switch(nil){
-		case SERVICE_ETHERNET:
-		case SERVICE_DP8390:
-			switch(il){
-				case SERVICE_IP:
-					return ETH_P_IP;
-				case SERVICE_ARP:
-					return ETH_P_ARP;
-				default:
-					return 0;
-			}
-		default:
-			return 0;
-	}
-}
+#include <ipc/services.h>
 
-/** Maps the network interface layer type to the internetwork layer service.
- *  @param[in] nil Network interface layer service.
- *  @param[in] protocol Network interface layer type.
- *  @returns Internetwork layer service of the network interface layer type.
- *  @returns 0 if mapping is not found.
- */
-static inline services_t protocol_unmap(services_t nil, int protocol){
-	switch(nil){
-		case SERVICE_ETHERNET:
-		case SERVICE_DP8390:
-			switch(protocol){
-				case ETH_P_IP:
-					return SERVICE_IP;
-				case ETH_P_ARP:
-					return SERVICE_ARP;
-				default:
-					return 0;
-			}
-		default:
-			return 0;
-	}
-}
-
-/** Maps the link service access point identifier to the Ethernet protocol identifier.
- *  @param[in] lsap Link service access point identifier.
- *  @returns Ethernet protocol identifier of the link service access point identifier.
- *  @returns ETH_LSAP_NULL if mapping is not found.
- */
-static inline eth_type_t lsap_map(eth_lsap_t lsap){
-	switch(lsap){
-		case ETH_LSAP_IP:
-			return ETH_P_IP;
-		case ETH_LSAP_ARP:
-			return ETH_P_ARP;
-		default:
-			return ETH_LSAP_NULL;
-	}
-}
-
-/** Maps the Ethernet protocol identifier to the link service access point identifier.
- *  @param[in] ethertype Ethernet protocol identifier.
- *  @returns Link service access point identifier.
- *  @returns 0 if mapping is not found.
- */
-static inline eth_lsap_t lsap_unmap(eth_type_t ethertype){
-	switch(ethertype){
-		case ETH_P_IP:
-			return ETH_LSAP_IP;
-		case ETH_P_ARP:
-			return ETH_LSAP_ARP;
-		default:
-			return 0;
-	}
-}
-
-/** Maps the network interface layer services to the hardware types.
- *  @param[in] nil The network interface service.
- *  @returns The hardware type of the network interface service.
- *  @returns 0 if mapping is not found.
- */
-static inline hw_type_t hardware_map(services_t nil){
-	switch(nil){
-		case SERVICE_ETHERNET:
-		case SERVICE_DP8390:
-			return HW_ETHER;
-		default:
-			return 0;
-	}
-}
+eth_type_t protocol_map(services_t, services_t);
+services_t protocol_unmap(services_t, int);
+eth_type_t lsap_map(eth_lsap_t);
+eth_lsap_t lsap_unmap(eth_type_t);
+hw_type_t hardware_map(services_t);
 
 #endif