From patchwork Wed Dec 18 07:23:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 302716 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 536EE2C00A8 for ; Wed, 18 Dec 2013 18:23:48 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751810Ab3LRHXo (ORCPT ); Wed, 18 Dec 2013 02:23:44 -0500 Received: from mail-qe0-f73.google.com ([209.85.128.73]:35600 "EHLO mail-qe0-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751184Ab3LRHXn (ORCPT ); Wed, 18 Dec 2013 02:23:43 -0500 Received: by mail-qe0-f73.google.com with SMTP id 5so735844qeb.0 for ; Tue, 17 Dec 2013 23:23:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:subject:message-id:user-agent:mime-version :content-type; bh=Zu+iQsGj2CP1LfO1xU1Wro5lPh8Po057VDWVGLLCgCw=; b=lTj3OV6hduZqS+5d9SCyb0pbg/lHmE0jUidEzgwTffkoR+8j6SbnqeELLAMRDIvH3M koQtbAe9iocuokMQ+5ARkHufMcKdhfZNvbRfCjtRZtMR4pLUSsm6W4rhAomCJUvIB+6i 2tB04hbCYaw+4VbLvZDl+U7T0FJP1d36x4dT2uOVs1uQVZcWLsQgNoeYBgij/iMwXRKn a5PcexprAbEd0Gj/bqVMeCwaTZ2S4fIJJ+OAn48iMDTpytiFcb6OOIWCFi+zjf3kXT3p FCWh4RJw6EEmxm5pGKlc5bRp+nC7kfLqmR0OldeXr6Ew/+mC0w09EFnBhMWPIqOfFWi8 74mA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:subject:message-id:user-agent :mime-version:content-type; bh=Zu+iQsGj2CP1LfO1xU1Wro5lPh8Po057VDWVGLLCgCw=; b=IlmRZje9cA4Gj184vHAo1XqUHM0gX8Eo2msr+aACHg/5Mbxu9+xSoPqye62VtRQCP/ 7dXR+GeTnemqrZsY3al7oAyO7ZEreznzkGYBTwQrJorP530g7qVME2RPOYnbb95ifbZl Q72zWIeXxDesT0CMYMQ5mj2NItjSx3W4xeM6isMR2szob1Q4jCmwQv9iilkmfpJzAWUM C5HxSS6l7NwzhKqCVXERnrx6mH0ydVnITImDjreCuxBvIg6MrL8Z3YW9Wj9+c5J+G/3K 43XVuYQ+Nz7M/BtIvfmlJ2a6VEY5/JfpNeTu+yQXA0059mdF2kGNC3C70volcgUehA6H +cnQ== X-Gm-Message-State: ALoCoQlrpzIxCcDs8eu33hqTZkK8aljm1Rsi6IlmtPxiv2z55iatT36DDZplgLJxI5yZXToH0s+1zMMuf2/8BiX2pltAtW0VSbRnjs39NMB/wMBfmuqbCPX3B+FEG666NyGUQp+vgKrWNquxKW323N4xF9GzIq07SzuM8DHmUtgO5lTu5YL8fs8yBUn9jGJGPLE7PonQgcj+Zavx27EsJMJTuscIdUbT8w== X-Received: by 10.58.107.198 with SMTP id he6mr9352803veb.2.1387351423194; Tue, 17 Dec 2013 23:23:43 -0800 (PST) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id x29si3949671yha.0.2013.12.17.23.23.43 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Dec 2013 23:23:43 -0800 (PST) Received: from tomh.mtv.corp.google.com (tomh.mtv.corp.google.com [172.18.82.128]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id D34DD5A41A2; Tue, 17 Dec 2013 23:23:42 -0800 (PST) Received: by tomh.mtv.corp.google.com (Postfix, from userid 60832) id 940C120060F; Tue, 17 Dec 2013 23:23:42 -0800 (PST) Received: from localhost (localhost [127.0.0.1]) by tomh.mtv.corp.google.com (Postfix) with ESMTP id 89D3A20054E; Tue, 17 Dec 2013 23:23:42 -0800 (PST) Date: Tue, 17 Dec 2013 23:23:42 -0800 (PST) From: Tom Herbert To: davem@davemloft.net, netdev@vger.kernel.org Subject: [PATCH 04/15] net: cisco-enic calls skb_set_hash Message-ID: User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Drivers should call skb_set_hash to set the hash and its type in an skbuff. Signed-off-by: Tom Herbert --- drivers/net/ethernet/cisco/enic/enic_main.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c index ff78dfa..b740bfc 100644 --- a/drivers/net/ethernet/cisco/enic/enic_main.c +++ b/drivers/net/ethernet/cisco/enic/enic_main.c @@ -1036,11 +1036,12 @@ static void enic_rq_indicate_buf(struct vnic_rq *rq, skb->protocol = eth_type_trans(skb, netdev); skb_record_rx_queue(skb, q_number); if (netdev->features & NETIF_F_RXHASH) { - skb->rxhash = rss_hash; - if (rss_type & (NIC_CFG_RSS_HASH_TYPE_TCP_IPV6_EX | - NIC_CFG_RSS_HASH_TYPE_TCP_IPV6 | - NIC_CFG_RSS_HASH_TYPE_TCP_IPV4)) - skb->l4_rxhash = true; + skb_set_hash(skb, rss_hash, + (rss_type & + (NIC_CFG_RSS_HASH_TYPE_TCP_IPV6_EX | + NIC_CFG_RSS_HASH_TYPE_TCP_IPV6 | + NIC_CFG_RSS_HASH_TYPE_TCP_IPV4)) ? + PKT_HASH_TYPE_L4 : PKT_HASH_TYPE_L3); } if ((netdev->features & NETIF_F_RXCSUM) && !csum_not_calc) {