On Friday 10 June 2016 14:21:29 Florian Westphal wrote:
[...]
> BATMAN uses it as an intermediate return value to signal
> forwarding vs. buffering, but it will not return POLICED to
> callers outside of BATMAN.
[...]
> diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c
> index f2f1256..b1a4e8a 100644
> --- a/net/batman-adv/send.c
> +++ b/net/batman-adv/send.c
> @@ -156,7 +156,7 @@ int batadv_send_unicast_skb(struct sk_buff *skb,
> * attempted.
> *
> * Return: NET_XMIT_SUCCESS on success, NET_XMIT_DROP on failure, or
> - * NET_XMIT_POLICED if the skb is buffered for later transmit.
> + * -EINPROGRESS if the skb is buffered for later transmit.
> */
> int batadv_send_skb_to_orig(struct sk_buff *skb,
> struct batadv_orig_node *orig_node,
> @@ -188,7 +188,7 @@ int batadv_send_skb_to_orig(struct sk_buff *skb,
> * network coding fails, then send the packet as usual.
> */
> if (recv_if && batadv_nc_skb_forward(skb, neigh_node)) {
> - ret = NET_XMIT_POLICED;
> + ret = -EINPROGRESS;
> } else {
> batadv_send_unicast_skb(skb, neigh_node);
> ret = NET_XMIT_SUCCESS;
Looks good to me. But it has a minor conflict with a queued up patch
for David (not yet submitted by Antonio). This is not real problem for
you but it looks like there is something wrong with the queued up patch.
I have submitted a fix for it and Antonio should just know that it is
related to this one.
But to your patch:
Reviewed-by: Sven Eckelmann <s...@narfation.org>
Kind regards,
Sven
signature.asc
Description: This is a digitally signed message part.
