1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00

Merge pull request #12630 from miri64/gnrc_sixlowpan_iphc/cleanup/duplicate-netif-get

gnrc_sixlowpan_iphc: remove duplicate gnrc_netif_hdr_get_netif()
This commit is contained in:
Martine Lenders 2019-11-01 19:46:52 +01:00 committed by GitHub
commit 1b02acf497
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -673,6 +673,7 @@ void gnrc_sixlowpan_iphc_send(gnrc_pktsnip_t *pkt, void *ctx, unsigned page)
uint16_t inline_pos = SIXLOWPAN_IPHC_HDR_LEN;
(void)ctx;
assert(iface != NULL);
dispatch = NULL; /* use dispatch as temporary pointer for prev */
/* determine maximum dispatch size and write protect all headers until
* then because they will be removed */
@ -1035,9 +1036,7 @@ void gnrc_sixlowpan_iphc_send(gnrc_pktsnip_t *pkt, void *ctx, unsigned page)
dispatch->next = pkt->next;
pkt->next = dispatch;
gnrc_netif_t *netif = gnrc_netif_hdr_get_netif(netif_hdr);
assert(netif != NULL);
gnrc_sixlowpan_multiplex_by_size(pkt, orig_datagram_size, netif, page);
gnrc_sixlowpan_multiplex_by_size(pkt, orig_datagram_size, iface, page);
}
/** @} */