From patchwork Fri Sep 24 23:15:48 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: laurent chavey X-Patchwork-Id: 65706 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 59F04B7125 for ; Sat, 25 Sep 2010 09:15:57 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756765Ab0IXXPw (ORCPT ); Fri, 24 Sep 2010 19:15:52 -0400 Received: from smtp-out.google.com ([216.239.44.51]:50774 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755424Ab0IXXPw (ORCPT ); Fri, 24 Sep 2010 19:15:52 -0400 Received: from kpbe17.cbf.corp.google.com (kpbe17.cbf.corp.google.com [172.25.105.81]) by smtp-out.google.com with ESMTP id o8ONFp0V025645 for ; Fri, 24 Sep 2010 16:15:51 -0700 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=google.com; s=beta; t=1285370151; bh=VY6LrUZe/bd7LeiOMje3TjL4iWY=; h=From:Date:Message-Id:To:CC:Subject; b=O5WsVvy5llIEjGaSzv3oX9mnF6keqYfx1wErNFWMcxAOFrc1ZsKincjfzKJv0S41l mExCF+PFI0eQMxmn2W2Aw== DomainKey-Signature: a=rsa-sha1; s=beta; d=google.com; c=nofws; q=dns; h=from:date:message-id:to:cc:subject:x-system-of-record; b=FgCgCeLEOOpjV176Fybe0fNT/aV3HD1DgDPDmaFy64u0a6mR1bwQ2RfM4/w/frNcV g8+NwWxPwR3jAYrNzvFww== Received: from pwi9 (pwi9.prod.google.com [10.241.219.9]) by kpbe17.cbf.corp.google.com with ESMTP id o8ONFoVA022493 for ; Fri, 24 Sep 2010 16:15:50 -0700 Received: by pwi9 with SMTP id 9so2877495pwi.2 for ; Fri, 24 Sep 2010 16:15:49 -0700 (PDT) Received: by 10.114.173.5 with SMTP id v5mr4426022wae.79.1285370149784; Fri, 24 Sep 2010 16:15:49 -0700 (PDT) Received: from chavey.mtv.corp.google.com (chavey.mtv.corp.google.com [172.22.64.28]) by mx.google.com with ESMTPS id 33sm4405518wad.6.2010.09.24.16.15.48 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 24 Sep 2010 16:15:49 -0700 (PDT) From: chavey@google.com Date: Fri, 24 Sep 2010 16:15:48 -0700 Message-Id: To: chavey@google.com CC: netdev@vger.kernel.org, therbert@google.com Subject: [PATCH 1/1] net-gre: clear skb->queue_mapping in GRE recv path X-System-Of-Record: true Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: chavey Date: Fri, 24 Sep 2010 15:05:02 -0700 A continuous stream of errors: slbgre0 received packet on queue [123], but number of RX queues is 1 net_ratelimit: 155786 callbacks suppressed is filling up /var/log/messages. This is due to not unsetting skb->queue_mapping in the GRE receive path. Signed-off-by: chavey --- net/ipv4/ip_gre.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 945b20a..53bdb97 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -641,6 +641,7 @@ static int ipgre_rcv(struct sk_buff *skb) } skb_tunnel_rx(skb, tunnel->dev); + skb_set_queue_mapping(skb, 0); skb_reset_network_header(skb); ipgre_ecn_decapsulate(iph, skb);