[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <51C1F3C3.4060900@cogentembedded.com>
Date: Wed, 19 Jun 2013 22:09:07 +0400
From: Sergei Shtylyov <sergei.shtylyov@...entembedded.com>
To: Vlad Yasevich <vyasevic@...hat.com>
CC: netdev@...r.kernel.org, davem@...emloft.net, mst@...hat.com,
jasowang@...hat.com
Subject: Re: [PATCH net-next 2/2] macvtap: Perform GSO on forwarding path.
Hello.
On 06/19/2013 06:47 PM, Vlad Yasevich wrote:
> When macvtap forwards skb to its tap, it needs to check
> if GSO needs to be performed. This is necessary
> when the HW device performed GRO, but the guest reading
> from the tap does not support it (ex: Windows 7).
> Signed-off-by: Vlad Yasevich <vyasevic@...hat.com>
> ---
> drivers/net/macvtap.c | 26 +++++++++++++++++++++++++-
> 1 file changed, 25 insertions(+), 1 deletion(-)
> diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
> index 09f0b1f..698f613 100644
> --- a/drivers/net/macvtap.c
> +++ b/drivers/net/macvtap.c
> @@ -291,13 +291,37 @@ static void macvtap_del_queues(struct net_device *dev)
> static int macvtap_forward(struct net_device *dev, struct sk_buff *skb)
> {
> struct macvtap_queue *q = macvtap_get_queue(dev, skb);
> + netdev_features_t features;
> if (!q)
> goto drop;
>
> if (skb_queue_len(&q->sk.sk_receive_queue) >= dev->tx_queue_len)
> goto drop;
>
> - skb_queue_tail(&q->sk.sk_receive_queue, skb);
> + features = netif_skb_features(skb);
> + if (netif_needs_gso(skb, features)) {
> + struct sk_buff *segs = skb_gso_segment(skb, features);
> +
> + if (IS_ERR(segs))
> + goto drop;
> +
> + if (!segs) {
> + skb_queue_tail(&q->sk.sk_receive_queue, skb);
> + goto wake_up;
> + }
> +
> + kfree_skb(skb);
> + while (segs) {
> + struct sk_buff *nskb = segs->next;
> +
> + segs->next = NULL;
> + skb_queue_tail(&q->sk.sk_receive_queue, segs);
> + segs = nskb;
> + }
> + } else
> + skb_queue_tail(&q->sk.sk_receive_queue, skb);
According to Documentation/CodingStyle, *else* branch should have {}
if the other branch has it (and vice versa).
WBR, Sergei
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists