[SQUASH ME] removed shifts

RIOT-OS · Nov 16, 2015 · 75123b0 · 75123b0
1 parent 83a5f45
commit 75123b0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/sys/net/gnrc/routing/rpl/gnrc_rpl_dodag.c b/sys/net/gnrc/routing/rpl/gnrc_rpl_dodag.c
@@ -243,7 +243,7 @@ void gnrc_rpl_parent_update(gnrc_rpl_dodag_t *dodag, gnrc_rpl_parent_t *parent)
             kernel_pid_t if_id;
             if ((if_id = gnrc_ipv6_netif_find_by_addr(NULL, &all_RPL_nodes)) != KERNEL_PID_UNDEF) {
                 fib_add_entry(&gnrc_ipv6_fib_table, if_id, def.u8, sizeof(ipv6_addr_t),
-                              (0x00 << FIB_FLAG_NET_PREFIX_SHIFT | 0x0),
+                              0x0s,
                               parent->addr.u8, sizeof(ipv6_addr_t), FIB_FLAG_RPL_ROUTE,
                               (dodag->default_lifetime * dodag->lifetime_unit) * SEC_IN_MS);
             }

diff --git a/tests/unittests/tests-fib/tests-fib.c b/tests/unittests/tests-fib/tests-fib.c
@@ -843,7 +843,7 @@ static void test_fib_19_default_gateway(void)
 
     /* add a default gateway entry */
     fib_add_entry(&test_fib_table, 42, (uint8_t *)addr_dst,
-                  add_buf_size, ((0x00 << FIB_FLAG_NET_PREFIX_SHIFT) | 0x123),
+                  add_buf_size, 0x123,
                   (uint8_t *)addr_nxt, add_buf_size, 0x23,
                   100000);