Changes in uspace/srv/net/il/ip/ip.h [a64c64d:91478aa] in mainline

File:

• uspace/srv/net/il/ip/ip.h (modified) (4 diffs)

uspace/srv/net/il/ip/ip.h

@@ -90 +90 @@
  *  @see device.h
  */
-DEVICE_MAP_DECLARE(ip_netifs, ip_netif_t)
+DEVICE_MAP_DECLARE( ip_netifs, ip_netif_t )
 
 /** IP registered protocols.
@@ -96 +96 @@
  *  @see int_map.h
  */
-INT_MAP_DECLARE(ip_protos, ip_proto_t)
+INT_MAP_DECLARE( ip_protos, ip_proto_t )
 
 /** IP routing table.
  *  @see generic_field.h
  */
-GENERIC_FIELD_DECLARE(ip_routes, ip_route_t)
+GENERIC_FIELD_DECLARE( ip_routes, ip_route_t )
 
 /** IP network interface specific data.
  */
 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;
+        module_ref      arp;
+        /** IP version.
+         */
+        int                     ipv;
+        /** Indicates whether using DHCP.
+         */
+        int                     dhcp;
+        /** Indicates whether IP routing is enabled.
+         */
+        int                     routing;
+        /** Device state.
+         */
+        device_state_t  state;
         /** Broadcast address.
          */
-        in_addr_t broadcast;
-        /** Device identifier.
-         */
-        device_id_t device_id;
-        /** Indicates whether using DHCP.
-         */
-        int dhcp;
-        /** IP version.
-         */
-        int ipv;
+        in_addr_t       broadcast;
+        /** Routing table.
+         */
+        ip_routes_t     routes;
         /** 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.
+        packet_dimension_t      packet_dimension;
+};
+
+/** IP protocol specific data.
+ */
+struct ip_proto{
+        /** Protocol number.
+         */
+        int     protocol;
+        /** Protocol module service.
          */
         services_t service;
-        /** Device state.
-         */
-        device_state_t state;
-};
-
-/** IP protocol specific data.
- */
-struct ip_proto{
         /** Protocol module phone.
          */
-        int phone;
-        /** Protocol number.
-         */
-        int protocol;
+        int     phone;
         /** Protocol packet receiving function.
          */
         tl_received_msg_t received_msg;
-        /** Protocol module service.
-         */
-        services_t service;
 };
 
@@ -164 +164 @@
         /** Target address.
          */
-        in_addr_t address;
+        in_addr_t               address;
+        /** Target network mask.
+         */
+        in_addr_t               netmask;
         /** Gateway.
          */
-        in_addr_t gateway;
+        in_addr_t               gateway;
         /** Parent netif.
          */
-        ip_netif_ref netif;
-        /** Target network mask.
-         */
-        in_addr_t netmask;
+        ip_netif_ref    netif;
 };
 
@@ -179 +179 @@
  */
 struct  ip_globals{
+        /** Networking module phone.
+         */
+        int                     net_phone;
+        /** Registered network interfaces.
+         */
+        ip_netifs_t     netifs;
+        /** Netifs safeyt lock.
+         */
+        fibril_rwlock_t netifs_lock;
+        /** Registered protocols.
+         */
+        ip_protos_t     protos;
+        /** Protocols safety lock.
+         */
+        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;
-        /** Default gateway.
-         */
-        ip_route_t gateway;
+        /** Packet counter.
+         */
+        uint16_t        packet_counter;
         /** Safety lock.
          */
-        fibril_rwlock_t lock;
-        /** Known support modules.
-         */
-        modules_t modules;
-        /** Networking module phone.
-         */
-        int net_phone;
-        /** Registered network interfaces.
-         */
-        ip_netifs_t netifs;
-        /** Netifs safeyt lock.
-         */
-        fibril_rwlock_t netifs_lock;
-        /** Packet counter.
-         */
-        uint16_t packet_counter;
-        /** Registered protocols.
-         */
-        ip_protos_t protos;
-        /** Protocols safety lock.
-         */
-        fibril_rwlock_t protos_lock;
+        fibril_rwlock_t lock;
 };