Re: [B.A.T.M.A.N.] [PATCHv3 2/3] batman-adv: Receive fragmented packets and merge

[Antonio Quartulli <ordex@autistici.org>]

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

On Tue, May 21, 2013 at 12:48:18PM +0200, Martin Hundebøll wrote:
> +bool batadv_frag_skb_fwd(struct sk_buff *skb,
> +			 struct batadv_hard_iface *recv_if,
> +			 struct batadv_orig_node *orig_node_src)
> +{
> +	struct batadv_priv *bat_priv = netdev_priv(recv_if->soft_iface);
> +	struct batadv_orig_node *orig_node_dst = NULL;
> +	struct batadv_neigh_node *neigh_node = NULL;
> +	struct batadv_frag_packet *packet;
> +	uint16_t total_size;
> +	bool ret = false;
> +
> +	packet = (struct batadv_frag_packet *)skb->data;
> +	orig_node_dst = batadv_orig_hash_find(bat_priv, packet->dest);
> +	if (!orig_node_dst)
> +		goto out;
> +
> +	neigh_node = batadv_find_router(bat_priv, orig_node_dst, recv_if);
> +	if (!neigh_node)
> +		goto out;
> +
> +	/* Forward the fragment, if the merged packet would be too big to
> +	 * be assembled.
> +	 */
> +	total_size = ntohs(packet->total_size) + ETH_HLEN;
> +	if (total_size > neigh_node->if_incoming->net_dev->mtu) {

I guess here you forgot to remove the ETH_LEN from the total_size computation.

> +		batadv_inc_counter(bat_priv, BATADV_CNT_FRAG_FWD);
> +		batadv_add_counter(bat_priv, BATADV_CNT_FRAG_FWD_BYTES,
> +				   skb->len + ETH_HLEN);

and here should ETH_HLEN be counted in the amount of bytes sent?

Moreover we are always avoiding third person in kernel doc ("Returns" should be
"Return" and so on..) and you should not put () (in the kernel doc).


Cheers,

-- 
Antonio Quartulli

..each of us alone is worth nothing..
Ernesto "Che" Guevara

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