From patchwork Mon Feb 22 17:25:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudip Mukherjee X-Patchwork-Id: 586417 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 AF53A14031D for ; Tue, 23 Feb 2016 04:26:14 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=g1hskYAI; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753250AbcBVRZ4 (ORCPT ); Mon, 22 Feb 2016 12:25:56 -0500 Received: from mail-pa0-f47.google.com ([209.85.220.47]:35655 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751569AbcBVRZy (ORCPT ); Mon, 22 Feb 2016 12:25:54 -0500 Received: by mail-pa0-f47.google.com with SMTP id ho8so96777610pac.2; Mon, 22 Feb 2016 09:25:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=PbBOHaZUQdpPlmxd7wuePbRou9c9Vt7jZg7hfSfDvvI=; b=g1hskYAIgbjgRZqogINJZm28/HMsEUb3OL5KjgQZcJ8bZUFizASY4KPey9EtLxZo2y ZO1BJA/9h3ENbYQRdn3hUxZMalnvisL+RH+l4811CkEkAnhUtVcihSDeGfb+sBbT5y3J 564T/BvluhS8M9wj9dAXQJq603e1RCDEVX5L8bvfiZJ9k7nCVq7VzD5SOvqOF8G2LwZu CiQaaKXpTscpZ6AgGiQ1obqQixmyLQd0A7BPgmbGwlv0/Oca0+FmZsdF48m+2ltk+QF0 +JuIKllFmKD/OIifQ30hk2+ol3iOw/iahO2sirCH59gnsGeHlD64GNmRWfC3NCreA07v 9OLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=PbBOHaZUQdpPlmxd7wuePbRou9c9Vt7jZg7hfSfDvvI=; b=bJOearwc14i2v/H/LMYDDH6BabIQioF+y3VQkyx8ySZ7pq55wgna5zxx2e3LU5MjyL 1e5bv5JXNiIIWCkdega7+1tXmNp8h0GA4RhLjFacnZfMj97ERkgat29ajTqSijlwK+NA 4JNenamwscn3MBtF2GbGEccZxoZcRQnXN8RshDWUei9+HiIkH0lPL00OppLZ75+OpXCA F+FIFsib9jOAlXSnQtgZ05ypF61/UHtjDmVp0Lpo3gxnwOzVmRtB+tGL7cfAuhnBiST6 QTMPYKg9N47TN/Rk7SCRwd86q+W0J/nnpjViHIqQUY1UtJWvzeY0dJuH9o1tobms1ydL lSLg== X-Gm-Message-State: AG10YOTwlqtmzf7O5rRw13wysoc+cBfK1dylwufC2GaPvV87/WQNVgA1sgC68F0sHtUQUA== X-Received: by 10.66.102.8 with SMTP id fk8mr39935495pab.12.1456161953905; Mon, 22 Feb 2016 09:25:53 -0800 (PST) Received: from localhost.localdomain ([103.24.124.194]) by smtp.gmail.com with ESMTPSA id o184sm38255307pfo.36.2016.02.22.09.25.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 Feb 2016 09:25:53 -0800 (PST) From: Sudip Mukherjee To: Wingman Kwok , Murali Karicheri , "David S. Miller" Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Sudip Mukherjee , John Fastabend Subject: [PATCH] netcp: use pointer to fix build fail Date: Mon, 22 Feb 2016 22:55:43 +0530 Message-Id: <1456161943-9206-1-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org While building keystone_defconfig of arm we are getting build failure with the error: drivers/net/ethernet/ti/netcp_core.c:1846:31: error: invalid type argument of '->' (have 'struct tc_to_netdev') if (handle != TC_H_ROOT || tc->type != TC_SETUP_MQPRIO) ^ drivers/net/ethernet/ti/netcp_core.c:1851:35: error: invalid type argument of '->' (have 'struct tc_to_netdev') (dev->real_num_tx_queues < tc->tc)) ^ drivers/net/ethernet/ti/netcp_core.c:1855:8: error: invalid type argument of '->' (have 'struct tc_to_netdev') if (tc->tc) { ^ drivers/net/ethernet/ti/netcp_core.c:1856:28: error: invalid type argument of '->' (have 'struct tc_to_netdev') netdev_set_num_tc(dev, tc->tc); ^ drivers/net/ethernet/ti/netcp_core.c:1857:21: error: invalid type argument of '->' (have 'struct tc_to_netdev') for (i = 0; i < tc->tc; i++) ^ drivers/net/ethernet/ti/netcp_core.c: At top level: drivers/net/ethernet/ti/netcp_core.c:1879:2: warning: initialization from incompatible pointer type .ndo_setup_tc = netcp_setup_tc, ^ The callback of ndo_setup_tc should be: int (*ndo_setup_tc)(struct net_device *dev, u32 handle, __be16 protocol, struct tc_to_netdev *tc); But we missed marking the last argument as a pointer. Fixes: 16e5cc647173 ("net: rework setup_tc ndo op to consume general tc operand") CC: John Fastabend Signed-off-by: Sudip Mukherjee --- build log at: https://travis-ci.org/sudipm-mukherjee/parport/jobs/110890068 drivers/net/ethernet/ti/netcp_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c index 8586a20..06a0a73 100644 --- a/drivers/net/ethernet/ti/netcp_core.c +++ b/drivers/net/ethernet/ti/netcp_core.c @@ -1836,7 +1836,7 @@ static u16 netcp_select_queue(struct net_device *dev, struct sk_buff *skb, } static int netcp_setup_tc(struct net_device *dev, u32 handle, __be16 proto, - struct tc_to_netdev tc) + struct tc_to_netdev *tc) { int i;