{"action":"created","comment":{"url":"https://api.github.com/repos/RIOT-OS/RIOT/pulls/comments/43096784","id":43096784,"diff_hunk":"@@ -422,38 +422,44 @@ void gnrc_ndp_rtr_sol_handle(kernel_pid_t iface, gnrc_pktsnip_t *pkt,\n         _stale_nc(iface, &ipv6->src, l2src, l2src_len);\n         /* send delayed */\n         if (if_entry->flags & GNRC_IPV6_NETIF_FLAGS_RTR_ADV) {\n-            timex_t delay;\n+            uint32_t delay;\n             uint32_t ms = GNRC_NDP_MAX_RTR_ADV_DELAY;\n #ifdef MODULE_GNRC_SIXLOWPAN_ND_ROUTER\n             if (if_entry->flags & GNRC_IPV6_NETIF_FLAGS_SIXLOWPAN) {\n                 ms = GNRC_SIXLOWPAN_ND_MAX_RTR_ADV_DELAY;\n             }\n #endif\n-            delay = timex_set(0, genrand_uint32_range(0, ms));\n-            vtimer_remove(&if_entry->rtr_adv_timer);\n+            delay = genrand_uint32_range(0, ms);\n+            xtimer_remove(&if_entry->rtr_adv_timer);\n #ifdef MODULE_GNRC_SIXLOWPAN_ND_ROUTER\n             /* in case of a 6LBR we have to check if the interface is actually\n              * the 6lo interface */\n             if (if_entry->flags & GNRC_IPV6_NETIF_FLAGS_SIXLOWPAN) {\n                 gnrc_ipv6_nc_t *nc_entry = gnrc_ipv6_nc_get(iface, &ipv6->src);\n                 if (nc_entry != NULL) {\n-                    vtimer_set_msg(&if_entry->rtr_adv_timer, delay, gnrc_ipv6_pid,\n-                            GNRC_NDP_MSG_RTR_ADV_SIXLOWPAN_DELAY, nc_entry);\n+                    if_entry->rtr_adv_msg.type = GNRC_NDP_MSG_RTR_ADV_SIXLOWPAN_DELAY;\n+                    if_entry->rtr_adv_msg.content.ptr = (char *) nc_entry;\n+                    xtimer_set_msg(&if_entry->rtr_adv_timer, delay, &if_entry->rtr_adv_msg,\n+                                   gnrc_ipv6_pid);\n                 }\n             }\n #elif defined(MODULE_GNRC_NDP_ROUTER) || defined(MODULE_GNRC_SIXLOWPAN_ND_BORDER_ROUTER)\n             if (ipv6_addr_is_unspecified(&ipv6->src)) {\n                 /* either multicast, if source unspecified */\n-                vtimer_set_msg(&if_entry->rtr_adv_timer, delay, gnrc_ipv6_pid,\n-                               GNRC_NDP_MSG_RTR_ADV_RETRANS, if_entry);\n+                if_entry->rtr_adv_msg.type = GNRC_NDP_MSG_RTR_ADV_RETRANS;\n+                if_entry->rtr_adv_msg.content.ptr = (char *) if_entry;\n+                xtimer_set_msg(&if_entry->rtr_adv_timer, delay, &if_entry->rtr_adv_msg,\n+                               gnrc_ipv6_pid);\n             }\n             else {\n                 /* or unicast, if source is known */\n                 /* XXX: can't just use GNRC_NETAPI_MSG_TYPE_SND, since the next retransmission\n                  * must also be set. */\n                 gnrc_ipv6_nc_t *nc_entry = gnrc_ipv6_nc_get(iface, &ipv6->src);\n-                vtimer_set_msg(&if_entry->rtr_adv_timer, delay, gnrc_ipv6_pid,\n-                               GNRC_NDP_MSG_RTR_ADV_DELAY, nc_entry);\n+                if_entry->rtr_adv_msg.type = GNRC_NDP_MSG_RTR_ADV_DELAY;\n+                if_entry->rtr_adv_msg.content.ptr = (char *) nc_entry;\n+                xtimer_set_msg(&if_entry->rtr_adv_timer, delay, &if_entry->rtr_adv_msg,\n+                               gnrc_ipv6_pid);","path":"sys/net/gnrc/network_layer/ndp/gnrc_ndp.c","position":50,"original_position":50,"commit_id":"8e3f7766aae8e336fced33ccfb6bf8ff268d2c18","original_commit_id":"8e3f7766aae8e336fced33ccfb6bf8ff268d2c18","user":{"login":"authmillenon","id":675644,"avatar_url":"https://avatars.githubusercontent.com/u/675644?v=3","gravatar_id":"","url":"https://api.github.com/users/authmillenon","html_url":"https://github.com/authmillenon","followers_url":"https://api.github.com/users/authmillenon/followers","following_url":"https://api.github.com/users/authmillenon/following{/other_user}","gists_url":"https://api.github.com/users/authmillenon/gists{/gist_id}","starred_url":"https://api.github.com/users/authmillenon/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/authmillenon/subscriptions","organizations_url":"https://api.github.com/users/authmillenon/orgs","repos_url":"https://api.github.com/users/authmillenon/repos","events_url":"https://api.github.com/users/authmillenon/events{/privacy}","received_events_url":"https://api.github.com/users/authmillenon/received_events","type":"User","site_admin":false},"body":"Wait… Why is this a timer of `if_entry`? At least to be consistent it has to be a timer of `nc_entry`.","created_at":"2015-10-27T09:08:14Z","updated_at":"2015-10-27T09:08:14Z","html_url":"https://github.com/RIOT-OS/RIOT/pull/4159#discussion_r43096784","pull_request_url":"https://api.github.com/repos/RIOT-OS/RIOT/pulls/4159","_links":{"self":{"href":"https://api.github.com/repos/RIOT-OS/RIOT/pulls/comments/43096784"},"html":{"href":"https://github.com/RIOT-OS/RIOT/pull/4159#discussion_r43096784"},"pull_request":{"href":"https://api.github.com/repos/RIOT-OS/RIOT/pulls/4159"}}},"pull_request":{"url":"https://api.github.com/repos/RIOT-OS/RIOT/pulls/4159","id":48791874,"html_url":"https://github.com/RIOT-OS/RIOT/pull/4159","diff_url":"https://github.com/RIOT-OS/RIOT/pull/4159.diff","patch_url":"https://github.com/RIOT-OS/RIOT/pull/4159.patch","issue_url":"https://api.github.com/repos/RIOT-OS/RIOT/issues/4159","number":4159,"state":"open","locked":false,"title":"netif: use xtimer for gnrc_ipv6_netif_t::rtr_adv_timer","user":{"login":"cgundogan","id":739129,"avatar_url":"https://avatars.githubusercontent.com/u/739129?v=3","gravatar_id":"","url":"https://api.github.com/users/cgundogan","html_url":"https://github.com/cgundogan","followers_url":"https://api.github.com/users/cgundogan/followers","following_url":"https://api.github.com/users/cgundogan/following{/other_user}","gists_url":"https://api.github.com/users/cgundogan/gists{/gist_id}","starred_url":"https://api.github.com/users/cgundogan/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cgundogan/subscriptions","organizations_url":"https://api.github.com/users/cgundogan/orgs","repos_url":"https://api.github.com/users/cgundogan/repos","events_url":"https://api.github.com/users/cgundogan/events{/privacy}","received_events_url":"https://api.github.com/users/cgundogan/received_events","type":"User","site_admin":false},"body":"replaces vtimer by xtimer for gnrc_ipv6_netif_t::rtr_adv_timer","created_at":"2015-10-26T20:22:27Z","updated_at":"2015-10-27T09:08:14Z","closed_at":null,"merged_at":null,"merge_commit_sha":"457e60a7ad8e1189f2039421bed9d3123fd8804d","assignee":{"login":"authmillenon","id":675644,"avatar_url":"https://avatars.githubusercontent.com/u/675644?v=3","gravatar_id":"","url":"https://api.github.com/users/authmillenon","html_url":"https://github.com/authmillenon","followers_url":"https://api.github.com/users/authmillenon/followers","following_url":"https://api.github.com/users/authmillenon/following{/other_user}","gists_url":"https://api.github.com/users/authmillenon/gists{/gist_id}","starred_url":"https://api.github.com/users/authmillenon/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/authmillenon/subscriptions","organizations_url":"https://api.github.com/users/authmillenon/orgs","repos_url":"https://api.github.com/users/authmillenon/repos","events_url":"https://api.github.com/users/authmillenon/events{/privacy}","received_events_url":"https://api.github.com/users/authmillenon/received_events","type":"User","site_admin":false},"milestone":null,"commits_url":"https://api.github.com/repos/RIOT-OS/RIOT/pulls/4159/commits","review_comments_url":"https://api.github.com/repos/RIOT-OS/RIOT/pulls/4159/comments","review_comment_url":"https://api.github.com/repos/RIOT-OS/RIOT/pulls/comments{/number}","comments_url":"https://api.github.com/repos/RIOT-OS/RIOT/issues/4159/comments","statuses_url":"https://api.github.com/repos/RIOT-OS/RIOT/statuses/8e3f7766aae8e336fced33ccfb6bf8ff268d2c18","head":{"label":"cgundogan:pr/netif/xtimer_rtr_adv_timer","ref":"pr/netif/xtimer_rtr_adv_timer","sha":"8e3f7766aae8e336fced33ccfb6bf8ff268d2c18","user":{"login":"cgundogan","id":739129,"avatar_url":"https://avatars.githubusercontent.com/u/739129?v=3","gravatar_id":"","url":"https://api.github.com/users/cgundogan","html_url":"https://github.com/cgundogan","followers_url":"https://api.github.com/users/cgundogan/followers","following_url":"https://api.github.com/users/cgundogan/following{/other_user}","gists_url":"https://api.github.com/users/cgundogan/gists{/gist_id}","starred_url":"https://api.github.com/users/cgundogan/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cgundogan/subscriptions","organizations_url":"https://api.github.com/users/cgundogan/orgs","repos_url":"https://api.github.com/users/cgundogan/repos","events_url":"https://api.github.com/users/cgundogan/events{/privacy}","received_events_url":"https://api.github.com/users/cgundogan/received_events","type":"User","site_admin":false},"repo":{"id":19483231,"name":"RIOT","full_name":"cgundogan/RIOT","owner":{"login":"cgundogan","id":739129,"avatar_url":"https://avatars.githubusercontent.com/u/739129?v=3","gravatar_id":"","url":"https://api.github.com/users/cgundogan","html_url":"https://github.com/cgundogan","followers_url":"https://api.github.com/users/cgundogan/followers","following_url":"https://api.github.com/users/cgundogan/following{/other_user}","gists_url":"https://api.github.com/users/cgundogan/gists{/gist_id}","starred_url":"https://api.github.com/users/cgundogan/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cgundogan/subscriptions","organizations_url":"https://api.github.com/users/cgundogan/orgs","repos_url":"https://api.github.com/users/cgundogan/repos","events_url":"https://api.github.com/users/cgundogan/events{/privacy}","received_events_url":"https://api.github.com/users/cgundogan/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/cgundogan/RIOT","description":"RIOT -  The friendly OS for IoT","fork":true,"url":"https://api.github.com/repos/cgundogan/RIOT","forks_url":"https://api.github.com/repos/cgundogan/RIOT/forks","keys_url":"https://api.github.com/repos/cgundogan/RIOT/keys{/key_id}","collaborators_url":"https://api.github.com/repos/cgundogan/RIOT/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/cgundogan/RIOT/teams","hooks_url":"https://api.github.com/repos/cgundogan/RIOT/hooks","issue_events_url":"https://api.github.com/repos/cgundogan/RIOT/issues/events{/number}","events_url":"https://api.github.com/repos/cgundogan/RIOT/events","assignees_url":"https://api.github.com/repos/cgundogan/RIOT/assignees{/user}","branches_url":"https://api.github.com/repos/cgundogan/RIOT/branches{/branch}","tags_url":"https://api.github.com/repos/cgundogan/RIOT/tags","blobs_url":"https://api.github.com/repos/cgundogan/RIOT/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/cgundogan/RIOT/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/cgundogan/RIOT/git/refs{/sha}","trees_url":"https://api.github.com/repos/cgundogan/RIOT/git/trees{/sha}","statuses_url":"https://api.github.com/repos/cgundogan/RIOT/statuses/{sha}","languages_url":"https://api.github.com/repos/cgundogan/RIOT/languages","stargazers_url":"https://api.github.com/repos/cgundogan/RIOT/stargazers","contributors_url":"https://api.github.com/repos/cgundogan/RIOT/contributors","subscribers_url":"https://api.github.com/repos/cgundogan/RIOT/subscribers","subscription_url":"https://api.github.com/repos/cgundogan/RIOT/subscription","commits_url":"https://api.github.com/repos/cgundogan/RIOT/commits{/sha}","git_commits_url":"https://api.github.com/repos/cgundogan/RIOT/git/commits{/sha}","comments_url":"https://api.github.com/repos/cgundogan/RIOT/comments{/number}","issue_comment_url":"https://api.github.com/repos/cgundogan/RIOT/issues/comments{/number}","contents_url":"https://api.github.com/repos/cgundogan/RIOT/contents/{+path}","compare_url":"https://api.github.com/repos/cgundogan/RIOT/compare/{base}...{head}","merges_url":"https://api.github.com/repos/cgundogan/RIOT/merges","archive_url":"https://api.github.com/repos/cgundogan/RIOT/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/cgundogan/RIOT/downloads","issues_url":"https://api.github.com/repos/cgundogan/RIOT/issues{/number}","pulls_url":"https://api.github.com/repos/cgundogan/RIOT/pulls{/number}","milestones_url":"https://api.github.com/repos/cgundogan/RIOT/milestones{/number}","notifications_url":"https://api.github.com/repos/cgundogan/RIOT/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/cgundogan/RIOT/labels{/name}","releases_url":"https://api.github.com/repos/cgundogan/RIOT/releases{/id}","created_at":"2014-05-06T06:16:02Z","updated_at":"2015-05-08T17:29:07Z","pushed_at":"2015-10-26T20:20:24Z","git_url":"git://github.com/cgundogan/RIOT.git","ssh_url":"git@github.com:cgundogan/RIOT.git","clone_url":"https://github.com/cgundogan/RIOT.git","svn_url":"https://github.com/cgundogan/RIOT","homepage":"https://github.com/RIOT-OS/RIOT/wiki","size":23500,"stargazers_count":0,"watchers_count":0,"language":"C","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"RIOT-OS:master","ref":"master","sha":"de539fa54f898a7b38658f9b3d6269bc65300305","user":{"login":"RIOT-OS","id":3079480,"avatar_url":"https://avatars.githubusercontent.com/u/3079480?v=3","gravatar_id":"","url":"https://api.github.com/users/RIOT-OS","html_url":"https://github.com/RIOT-OS","followers_url":"https://api.github.com/users/RIOT-OS/followers","following_url":"https://api.github.com/users/RIOT-OS/following{/other_user}","gists_url":"https://api.github.com/users/RIOT-OS/gists{/gist_id}","starred_url":"https://api.github.com/users/RIOT-OS/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/RIOT-OS/subscriptions","organizations_url":"https://api.github.com/users/RIOT-OS/orgs","repos_url":"https://api.github.com/users/RIOT-OS/repos","events_url":"https://api.github.com/users/RIOT-OS/events{/privacy}","received_events_url":"https://api.github.com/users/RIOT-OS/received_events","type":"Organization","site_admin":false},"repo":{"id":7370241,"name":"RIOT","full_name":"RIOT-OS/RIOT","owner":{"login":"RIOT-OS","id":3079480,"avatar_url":"https://avatars.githubusercontent.com/u/3079480?v=3","gravatar_id":"","url":"https://api.github.com/users/RIOT-OS","html_url":"https://github.com/RIOT-OS","followers_url":"https://api.github.com/users/RIOT-OS/followers","following_url":"https://api.github.com/users/RIOT-OS/following{/other_user}","gists_url":"https://api.github.com/users/RIOT-OS/gists{/gist_id}","starred_url":"https://api.github.com/users/RIOT-OS/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/RIOT-OS/subscriptions","organizations_url":"https://api.github.com/users/RIOT-OS/orgs","repos_url":"https://api.github.com/users/RIOT-OS/repos","events_url":"https://api.github.com/users/RIOT-OS/events{/privacy}","received_events_url":"https://api.github.com/users/RIOT-OS/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/RIOT-OS/RIOT","description":"RIOT -  The friendly OS for IoT","fork":false,"url":"https://api.github.com/repos/RIOT-OS/RIOT","forks_url":"https://api.github.com/repos/RIOT-OS/RIOT/forks","keys_url":"https://api.github.com/repos/RIOT-OS/RIOT/keys{/key_id}","collaborators_url":"https://api.github.com/repos/RIOT-OS/RIOT/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/RIOT-OS/RIOT/teams","hooks_url":"https://api.github.com/repos/RIOT-OS/RIOT/hooks","issue_events_url":"https://api.github.com/repos/RIOT-OS/RIOT/issues/events{/number}","events_url":"https://api.github.com/repos/RIOT-OS/RIOT/events","assignees_url":"https://api.github.com/repos/RIOT-OS/RIOT/assignees{/user}","branches_url":"https://api.github.com/repos/RIOT-OS/RIOT/branches{/branch}","tags_url":"https://api.github.com/repos/RIOT-OS/RIOT/tags","blobs_url":"https://api.github.com/repos/RIOT-OS/RIOT/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/RIOT-OS/RIOT/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/RIOT-OS/RIOT/git/refs{/sha}","trees_url":"https://api.github.com/repos/RIOT-OS/RIOT/git/trees{/sha}","statuses_url":"https://api.github.com/repos/RIOT-OS/RIOT/statuses/{sha}","languages_url":"https://api.github.com/repos/RIOT-OS/RIOT/languages","stargazers_url":"https://api.github.com/repos/RIOT-OS/RIOT/stargazers","contributors_url":"https://api.github.com/repos/RIOT-OS/RIOT/contributors","subscribers_url":"https://api.github.com/repos/RIOT-OS/RIOT/subscribers","subscription_url":"https://api.github.com/repos/RIOT-OS/RIOT/subscription","commits_url":"https://api.github.com/repos/RIOT-OS/RIOT/commits{/sha}","git_commits_url":"https://api.github.com/repos/RIOT-OS/RIOT/git/commits{/sha}","comments_url":"https://api.github.com/repos/RIOT-OS/RIOT/comments{/number}","issue_comment_url":"https://api.github.com/repos/RIOT-OS/RIOT/issues/comments{/number}","contents_url":"https://api.github.com/repos/RIOT-OS/RIOT/contents/{+path}","compare_url":"https://api.github.com/repos/RIOT-OS/RIOT/compare/{base}...{head}","merges_url":"https://api.github.com/repos/RIOT-OS/RIOT/merges","archive_url":"https://api.github.com/repos/RIOT-OS/RIOT/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/RIOT-OS/RIOT/downloads","issues_url":"https://api.github.com/repos/RIOT-OS/RIOT/issues{/number}","pulls_url":"https://api.github.com/repos/RIOT-OS/RIOT/pulls{/number}","milestones_url":"https://api.github.com/repos/RIOT-OS/RIOT/milestones{/number}","notifications_url":"https://api.github.com/repos/RIOT-OS/RIOT/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/RIOT-OS/RIOT/labels{/name}","releases_url":"https://api.github.com/repos/RIOT-OS/RIOT/releases{/id}","created_at":"2012-12-29T20:38:40Z","updated_at":"2015-10-26T06:25:55Z","pushed_at":"2015-10-27T08:23:17Z","git_url":"git://github.com/RIOT-OS/RIOT.git","ssh_url":"git@github.com:RIOT-OS/RIOT.git","clone_url":"https://github.com/RIOT-OS/RIOT.git","svn_url":"https://github.com/RIOT-OS/RIOT","homepage":"https://github.com/RIOT-OS/RIOT/wiki","size":136484,"stargazers_count":535,"watchers_count":535,"language":"C","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":419,"mirror_url":null,"open_issues_count":397,"forks":419,"open_issues":397,"watchers":535,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/RIOT-OS/RIOT/pulls/4159"},"html":{"href":"https://github.com/RIOT-OS/RIOT/pull/4159"},"issue":{"href":"https://api.github.com/repos/RIOT-OS/RIOT/issues/4159"},"comments":{"href":"https://api.github.com/repos/RIOT-OS/RIOT/issues/4159/comments"},"review_comments":{"href":"https://api.github.com/repos/RIOT-OS/RIOT/pulls/4159/comments"},"review_comment":{"href":"https://api.github.com/repos/RIOT-OS/RIOT/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/RIOT-OS/RIOT/pulls/4159/commits"},"statuses":{"href":"https://api.github.com/repos/RIOT-OS/RIOT/statuses/8e3f7766aae8e336fced33ccfb6bf8ff268d2c18"}}}}