@@ -206,18 +206,10 @@ static bool reassembly_cancel(u32_t id,
206206
207207static void reassembly_info (char * str , struct net_ipv6_reassembly * reass )
208208{
209- int i , len ;
210-
211- for (i = 0 , len = 0 ; i < NET_IPV6_FRAGMENTS_MAX_PKT ; i ++ ) {
212- if (reass -> pkt [i ]) {
213- len += net_pkt_get_len (reass -> pkt [i ]);
214- }
215- }
216-
217- NET_DBG ("%s id 0x%x src %s dst %s remain %d ms len %d" , str , reass -> id ,
209+ NET_DBG ("%s id 0x%x src %s dst %s remain %d ms" , str , reass -> id ,
218210 log_strdup (net_sprint_ipv6_addr (& reass -> src )),
219211 log_strdup (net_sprint_ipv6_addr (& reass -> dst )),
220- k_delayed_work_remaining_get (& reass -> timer ), len );
212+ k_delayed_work_remaining_get (& reass -> timer ));
221213}
222214
223215static void reassembly_timeout (struct k_work * work )
@@ -340,7 +332,8 @@ static void reassemble_packet(struct net_ipv6_reassembly *reass)
340332
341333 net_pkt_set_data (pkt , & ipv6_access );
342334
343- NET_DBG ("New pkt %p IPv6 len is %d bytes" , pkt , len );
335+ NET_DBG ("New pkt %p IPv6 len is %d bytes" , pkt ,
336+ len + NET_IPV6H_LEN );
344337
345338 /* We need to use the queue when feeding the packet back into the
346339 * IP stack as we might run out of stack if we call processing_data()
@@ -475,7 +468,7 @@ enum net_verdict net_ipv6_handle_fragment_hdr(struct net_pkt *pkt,
475468 net_pkt_set_ipv6_fragment_offset (pkt , flag & 0xfff8 );
476469
477470 if (!reass -> pkt [0 ]) {
478- NET_DBG ("Storing pkt %p to slot %d offset 0x%x " ,
471+ NET_DBG ("Storing pkt %p to slot %d offset %d " ,
479472 pkt , 0 , net_pkt_ipv6_fragment_offset (pkt ));
480473 reass -> pkt [0 ] = pkt ;
481474
@@ -503,7 +496,7 @@ enum net_verdict net_ipv6_handle_fragment_hdr(struct net_pkt *pkt,
503496 }
504497 }
505498
506- NET_DBG ("Storing pkt %p to slot %d offset 0x%x " ,
499+ NET_DBG ("Storing pkt %p to slot %d offset %d " ,
507500 pkt , i , net_pkt_ipv6_fragment_offset (pkt ));
508501 reass -> pkt [i ] = pkt ;
509502 found = true;
0 commit comments