Re: [B.A.T.M.A.N.] [PATCHv2 2/9] batman-adv: make struct batadv_orig_node algorithm agnostic

[Simon Wunderlich <simon.wunderlich@s2003.tu-chemnitz.de>]

[-- Attachment #1: Type: text/plain, Size: 1611 bytes --]

> diff --git a/routing.c b/routing.c
> index d4f512d..5b8f087 100644
> --- a/routing.c
> +++ b/routing.c
> @@ -1091,6 +1091,7 @@ int batadv_recv_bcast_packet(struct sk_buff *skb,
>  	int hdr_size = sizeof(*bcast_packet);
>  	int ret = NET_RX_DROP;
>  	int32_t seq_diff;
> +	uint32_t seqno;
>  
>  	/* drop packet if it has not necessary minimum size */
>  	if (unlikely(!pskb_may_pull(skb, hdr_size)))
> @@ -1126,12 +1127,13 @@ int batadv_recv_bcast_packet(struct sk_buff *skb,
>  
>  	spin_lock_bh(&orig_node->bcast_seqno_lock);
>  
> +	seqno = ntohl(bcast_packet->seqno);
>  	/* check whether the packet is a duplicate */
>  	if (batadv_test_bit(orig_node->bcast_bits, orig_node->last_bcast_seqno,
> -			    ntohl(bcast_packet->seqno)))
> +			    seqno))
>  		goto spin_unlock;
>  
> -	seq_diff = ntohl(bcast_packet->seqno) - orig_node->last_bcast_seqno;
> +	seq_diff = seqno - orig_node->last_bcast_seqno;
>  
>  	/* check whether the packet is old and the host just restarted. */
>  	if (batadv_window_protected(bat_priv, seq_diff,
> @@ -1142,7 +1144,7 @@ int batadv_recv_bcast_packet(struct sk_buff *skb,
>  	 * if required.
>  	 */
>  	if (batadv_bit_get_packet(bat_priv, orig_node->bcast_bits, seq_diff, 1))
> -		orig_node->last_bcast_seqno = ntohl(bcast_packet->seqno);
> +		orig_node->last_bcast_seqno = seqno;
>  
>  	spin_unlock_bh(&orig_node->bcast_seqno_lock);

Why are you changing this seqno stuff? Although this might be a valid
(micro-)optimization, I don't think this should be in this patch ... or
at least I don't understand it. :)

Cheers,
	Simon

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]