From patchwork Tue Nov 26 05:51:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 294207 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 B80C52C00A9 for ; Tue, 26 Nov 2013 16:57:10 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752972Ab3KZF5H (ORCPT ); Tue, 26 Nov 2013 00:57:07 -0500 Received: from mail-ve0-f201.google.com ([209.85.128.201]:36662 "EHLO mail-ve0-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751871Ab3KZF5D (ORCPT ); Tue, 26 Nov 2013 00:57:03 -0500 Received: by mail-ve0-f201.google.com with SMTP id jw12so557459veb.4 for ; Mon, 25 Nov 2013 21:57:02 -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=7FdQhE+CL3xHV2iShgbzFPCq7upB3zqH1xHzdDzfxaI=; b=BsrtL6WcBVfT5MM2WoJX+I08m+A4mqcuTJn/yeZliHg3yaxmmiKE/4TQukd56TyoAE eRAPoylhOkmn9Cc42RNBhLrix+S+6IGY8xkaAjzjBTLkZnKtrC+Algq7xFtt9Zi5QDxk QEQOJXoGyHRmlGdIz/vcRFJE7nuurgQMozZXq41yub6enxhYGySU+ULn5J5GSH/fFRqm iBo4kpwWuIQtM5V79MxbntXrJKp0QOKwuvk1MtDYr8xMYGx0cB3VLf0UkzRohf/jR7l4 IW+p6fmLQaeZXIUeWBaiOfJgte8gfX/t1iGbZNkDS7LtjR7usbxNrc97GqihfeVYRSju R6Rg== 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=7FdQhE+CL3xHV2iShgbzFPCq7upB3zqH1xHzdDzfxaI=; b=dP5lYYatQq47QsNtXobMZZ8bJajNNqyFn32qDBTFsOsYVamsN/honmdref/7PWa4cD nxan2ndn9+h20YKon9snjQzCuR1fh9zh7RDxIJ+7U7Q9cwEjdpGI89HYsuO48LsGZL2J IhiYr4T9aBkth+31f26s0vo3RNup8PLAvDla/MDThAMjCTQvLbVVp/J2DvpNJhhdZWU+ hmjBKzJ1lvhySoXtAANTSfEHx29jzfg2QYVqIbLSWBE1XqQJ6v9pbPuYgpU3UvQhycvR 8asttgp5Zo9CeyaYOdHn3TTiMfw0jEIymb+3NqijN1QdHc/cSKvHur4Zd/Op0jnVMWce L9aQ== X-Gm-Message-State: ALoCoQnEncdm+KZBfgfUOuQqdpxwTofSSW9FKlt6c6+N7kHFaMkNR2IiILOYInvGyAMOApKaHb7NWEUrbZCRN8XC2XRKG85PiJqqOUv/EJshj3NDE/rqcWbXEHeHVnwQ0qMHiypUvxkaaqZ2jzX8sTxd6ispCfopkHQLH8tYyvvHHgYib6dBmRi/Nio1BabsB5TaKjEun6/pT85obM1FLqKBQZFCuLNdYA== X-Received: by 10.52.248.195 with SMTP id yo3mr8930008vdc.1.1385445095991; Mon, 25 Nov 2013 21:51:35 -0800 (PST) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id k45si10547973yhn.4.2013.11.25.21.51.35 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Nov 2013 21:51:35 -0800 (PST) Received: from tomh.mtv.corp.google.com (tomh.mtv.corp.google.com [172.18.82.128]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id D1AE131C10E; Mon, 25 Nov 2013 21:51:35 -0800 (PST) Received: by tomh.mtv.corp.google.com (Postfix, from userid 60832) id 9001E200657; Mon, 25 Nov 2013 21:51:35 -0800 (PST) Received: from localhost (localhost [127.0.0.1]) by tomh.mtv.corp.google.com (Postfix) with ESMTP id 82843200646; Mon, 25 Nov 2013 21:51:35 -0800 (PST) Date: Mon, 25 Nov 2013 21:51:35 -0800 (PST) From: Tom Herbert To: davem@davemloft.net, netdev@vger.kernel.org Subject: [PATCH 06/17] net: cisco-enic calls skb_get_rxhash 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_get_rxhash to set the rxhash and its type in an skbuff. Signed-off-by: Tom Herbert Acked-by: Govindarajulu Varadarajan --- 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..ea30551 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_rxhash(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)) ? + RXHASH_TYPE_L4 : RXHASH_TYPE_L3); + } if ((netdev->features & NETIF_F_RXCSUM) && !csum_not_calc) {