From a6c02494fbd832ef24fc545944ffa0479ff86c06 Mon Sep 17 00:00:00 2001 From: Yevgeny Petrilin Date: Tue, 18 Oct 2011 01:51:09 +0000 Subject: [PATCH] --- yaml --- r: 266859 b: refs/heads/master c: 3b61008d88b55467cffee5db9b1e0cf32edbe8ac h: refs/heads/master i: 266857: 0b41b570f0c9fbe6bfdc9683b79c00d2d08addfb 266855: d2ddf4b78fc1be12ed2b2bd38b506843c2a90367 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/mellanox/mlx4/en_rx.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 77c7bb327bb1..484218225495 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad04378cecca9c33b5ea3e46aa4ed71b15e0be0c +refs/heads/master: 3b61008d88b55467cffee5db9b1e0cf32edbe8ac diff --git a/trunk/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/trunk/drivers/net/ethernet/mellanox/mlx4/en_rx.c index 6cc9471aa615..dbf466426f5a 100644 --- a/trunk/drivers/net/ethernet/mellanox/mlx4/en_rx.c +++ b/trunk/drivers/net/ethernet/mellanox/mlx4/en_rx.c @@ -618,6 +618,7 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud __vlan_hwaccel_put_tag(gro_skb, vid); } + skb_record_rx_queue(gro_skb, cq->ring); napi_gro_frags(&cq->napi); goto next;