Index: uspace/srv/net/il/ip/ip.h
===================================================================
--- uspace/srv/net/il/ip/ip.h	(revision aadf01ebd2c032bc8dd43a6e06ae5715e6c2710f)
+++ uspace/srv/net/il/ip/ip.h	(revision 60ab6c32bdd1487d23ce71b9720e1b79f4c121ed)
@@ -106,38 +106,38 @@
  */
 struct	ip_netif{
-	/** Device identifier.
-	 */
-	device_id_t device_id;
-	/** Netif module service.
-	 */
-	services_t service;
-	/** Netif module phone.
-	 */
-	int phone;
 	/** ARP module.
 	 *  Assigned if using ARP.
 	 */
 	module_ref arp;
+	/** Broadcast address.
+	 */
+	in_addr_t broadcast;
+	/** Device identifier.
+	 */
+	device_id_t device_id;
+	/** Indicates whether using DHCP.
+	 */
+	int dhcp;
 	/** IP version.
 	 */
 	int ipv;
-	/** Indicates whether using DHCP.
-	 */
-	int dhcp;
+	/** Packet dimension.
+	 */
+	packet_dimension_t packet_dimension;
+	/** Netif module phone.
+	 */
+	int phone;
+	/** Routing table.
+	 */
+	ip_routes_t routes;
 	/** Indicates whether IP routing is enabled.
 	 */
 	int routing;
+	/** Netif module service.
+	 */
+	services_t service;
 	/** Device state.
 	 */
 	device_state_t state;
-	/** Broadcast address.
-	 */
-	in_addr_t broadcast;
-	/** Routing table.
-	 */
-	ip_routes_t routes;
-	/** Packet dimension.
-	 */
-	packet_dimension_t packet_dimension;
 };
 
@@ -145,16 +145,16 @@
  */
 struct ip_proto{
+	/** Protocol module phone.
+	 */
+	int phone;
 	/** Protocol number.
 	 */
 	int protocol;
+	/** Protocol packet receiving function.
+	 */
+	tl_received_msg_t received_msg;
 	/** Protocol module service.
 	 */
 	services_t service;
-	/** Protocol module phone.
-	 */
-	int phone;
-	/** Protocol packet receiving function.
-	 */
-	tl_received_msg_t received_msg;
 };
 
@@ -165,7 +165,4 @@
 	 */
 	in_addr_t address;
-	/** Target network mask.
-	 */
-	in_addr_t netmask;
 	/** Gateway.
 	 */
@@ -174,4 +171,7 @@
 	 */
 	ip_netif_ref netif;
+	/** Target network mask.
+	 */
+	in_addr_t netmask;
 };
 
@@ -179,4 +179,16 @@
  */
 struct	ip_globals{
+	/** Default client connection function for support modules.
+	 */
+	async_client_conn_t client_connection;
+	/** Default gateway.
+	 */
+	ip_route_t gateway;
+	/** Safety lock.
+	 */
+	fibril_rwlock_t lock;
+	/** Known support modules.
+	 */
+	modules_t modules;
 	/** Networking module phone.
 	 */
@@ -188,4 +200,7 @@
 	 */
 	fibril_rwlock_t netifs_lock;
+	/** Packet counter.
+	 */
+	uint16_t packet_counter;
 	/** Registered protocols.
 	 */
@@ -194,19 +209,4 @@
 	 */
 	fibril_rwlock_t protos_lock;
-	/** Default gateway.
-	 */
-	ip_route_t gateway;
-	/** Known support modules.
-	 */
-	modules_t modules;
-	/** Default client connection function for support modules.
-	 */
-	async_client_conn_t client_connection;
-	/** Packet counter.
-	 */
-	uint16_t packet_counter;
-	/** Safety lock.
-	 */
-	fibril_rwlock_t lock;
 };