[SQUASH ME] remove ng_ prefix

RIOT-OS · Aug 17, 2015 · 94c5249 · 94c5249
1 parent a2b9441
commit 94c5249
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/sys/include/net/ng_rpl/structs.h b/sys/include/net/ng_rpl/structs.h
@@ -161,7 +161,7 @@ typedef struct __attribute__((packed)) {
     uint32_t valid_lifetime;    /**< valid lifetime */
     uint32_t pref_lifetime;     /**< preferred lifetime */
     uint32_t reserved;          /**< reserved */
-    ng_ipv6_addr_t prefix;      /**< prefix */
+    ipv6_addr_t prefix;         /**< prefix */
 } ng_rpl_opt_prefix_info_t;
 
 typedef struct ng_rpl_dodag ng_rpl_dodag_t;

diff --git a/sys/net/routing/ng_rpl/ng_rpl_control_messages.c b/sys/net/routing/ng_rpl/ng_rpl_control_messages.c
@@ -152,7 +152,7 @@ void ng_rpl_send_DIO(ng_rpl_dodag_t *dodag, ipv6_addr_t *destination)
         prefix_info->reserved = 0;
 
         memset(&prefix_info->prefix, 0, sizeof(prefix_info->prefix));
-        ng_ipv6_addr_init_prefix(&prefix_info->prefix, &dodag->dodag_id, dodag->prefix_len);
+        ipv6_addr_init_prefix(&prefix_info->prefix, &dodag->dodag_id, dodag->prefix_len);
 
         pos += sizeof(*prefix_info);
     }
@@ -269,14 +269,14 @@ bool _parse_options(int msg_type, ng_rpl_dodag_t *dodag, ng_rpl_opt_t *opt, uint
                 }
                 DEBUG("RPL: Prefix Information DIO option parsed\n");
                 ng_rpl_opt_prefix_info_t *pi = (ng_rpl_opt_prefix_info_t *) opt;
-                ng_ipv6_addr_t all_RPL_nodes = NG_IPV6_ADDR_ALL_RPL_NODES;
+                ipv6_addr_t all_RPL_nodes = NG_IPV6_ADDR_ALL_RPL_NODES;
                 kernel_pid_t if_id = ng_ipv6_netif_find_by_addr(NULL, &all_RPL_nodes);
                 /* check for the auto address-configuration flag */
                 if ((ng_netapi_get(if_id, NETOPT_IPV6_IID, 0, &iid, sizeof(eui64_t)) < 0) &&
                         !(pi->LAR_flags & NG_RPL_PREFIX_AUTO_ADDRESS_BIT)) {
                     break;
                 }
-                ng_ipv6_addr_set_aiid(&pi->prefix, iid.uint8);
+                ipv6_addr_set_aiid(&pi->prefix, iid.uint8);
                 ng_ipv6_netif_add_addr(if_id, &pi->prefix, pi->prefix_len, 0);
 
                 break;