Commit-ID: 2d47b45951af087c1a4439c559309b0bf90a0718 Gitweb: http://git.kernel.org/tip/2d47b45951af087c1a4439c559309b0bf90a0718 Author: Changli Gao <xiaosuo@xxxxxxxxx> AuthorDate: Tue, 17 Aug 2010 19:00:56 +0000 Committer: David S. Miller <davem@xxxxxxxxxxxxx> CommitDate: Thu, 19 Aug 2010 17:08:37 -0700 net: rps: reset network header before calling skb_get_rxhash() skb_get_rxhash() assumes the network header pointer of the skb is set properly after the commit: commit bfb564e7391340638afe4ad67744a8f3858e7566 Author: Krishna Kumar <krkumar2@xxxxxxxxxx> Date: Wed Aug 4 06:15:52 2010 +0000 core: Factor out flow calculation from get_rps_cpu Signed-off-by: Changli Gao <xiaosuo@xxxxxxxxx> Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx> --- net/core/dev.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index c1dc8a9..cf87fde 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2372,6 +2372,7 @@ static int get_rps_cpu(struct net_device *dev, struct sk_buff *skb, if (!rxqueue->rps_map && !rxqueue->rps_flow_table) goto done; + skb_reset_network_header(skb); if (!skb_get_rxhash(skb)) goto done; -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html