]> Pileus Git - ~andy/linux/commit
net/mlx4_en: call gro handler for encapsulated frames
authorEric Dumazet <edumazet@google.com>
Thu, 9 Jan 2014 18:30:13 +0000 (10:30 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 13 Jan 2014 19:41:47 +0000 (11:41 -0800)
commite6a767582942d6fd9da0ddea673f5a7017a365c7
tree10f11cf57b79842a9ab286f2e59e25ae303e384d
parentd10dbad2aafacc7e1391595596e7c5138892dd93
net/mlx4_en: call gro handler for encapsulated frames

In order to use the native GRO handling of encapsulated protocols on
mlx4, we need to call napi_gro_receive() instead of netif_receive_skb()
unless busy polling is in action.

While we are at it, rename mlx4_en_cq_ll_polling() to
mlx4_en_cq_busy_polling()

Tested with GRE tunnel : GRO aggregation is now performed on the
ethernet device instead of being done later on gre device.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Amir Vadai <amirv@mellanox.com>
Cc: Jerry Chu <hkchu@google.com>
Cc: Or Gerlitz <ogerlitz@mellanox.com>
Acked-By: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlx4/en_rx.c
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h