From patchwork Tue May 9 10:04:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98900 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1739470qge; Tue, 9 May 2017 03:05:26 -0700 (PDT) X-Received: by 10.99.145.195 with SMTP id l186mr23544684pge.123.1494324326803; Tue, 09 May 2017 03:05:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494324326; cv=none; d=google.com; s=arc-20160816; b=RE7oTZioP9Iu6od+rF3zAKLAvt88uvyJcgA17Y0C4o36UVSRUT6NvMpLu+6qRy6pPx NmPGJ1fiVjavSV4/khrkAm5zJRK0+gz79cxeJDhfbjCvxgfVL4a/XgOyVrt/jdHL0Djk 7+oKR/vKroywt1MZT8hIs3Knq05nCOfNav/5guScHc4g0NGXYbfRzzVS0FLhOXWg2ZrN bS03TeLj0XRRN3UkrX2Ze4qwlo+yHR8n2R25CAlLxTQZVS8sUzoWBcZMVz97undKubjs m6AZu1XltxNenRGLHLlEBhZIZuW5H93VsrOg2+b9u1HZfRZ8PTNEhyF7gx1izXZQ3a/U 64zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=cDgLU7Cg/M6TJiEpxoHch+3iX0BhystHsj7XhRYN890=; b=tbv0SRiy+bZzVMrRc1KbbuZAe2DJbY9ZFMAnWfoVkIOCYhsxVjisnN9dnQU7jBy2Jc w56zHoYHbr3ZgHMFhZLLW25etxqXcNKeq5Wd/jbckAveUwe4/GXdz3X8qruI7GjYwTJf h8tUsUI039Br51fHSexSOPplx8VJt7pgjdjaDmJ4tHcosIEcOgTr9LQQJxTp8ACrE5Cx ppKwIXPwFXbFQq4h9I6bbK8sPmG4vUmDIrZC57qshTk/iktOx+8SNHIC/1j7AI0HIE3c WZGpLMk0yVlLQjY3EFDF8fubBhQpgHmDH3GZKPjQMrVsk3/GYcN/hIzruWrFq/ZcktK3 V88g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h13si12805392pgn.51.2017.05.09.03.05.26; Tue, 09 May 2017 03:05:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752140AbdEIKFZ (ORCPT + 6 others); Tue, 9 May 2017 06:05:25 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:64748 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752009AbdEIKFZ (ORCPT ); Tue, 9 May 2017 06:05:25 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0MXCaX-1dUwBt2MLN-00WBXx; Tue, 09 May 2017 12:05:16 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Paul Burton , "David S . Miller" , Arnd Bergmann , Greg Kroah-Hartman Subject: [PATCH 3.16-stable 09/14] net: ti: cpmac: Fix compiler warning due to type confusion Date: Tue, 9 May 2017 12:04:57 +0200 Message-Id: <20170509100502.1358298-10-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170509100502.1358298-1-arnd@arndb.de> References: <20170509100502.1358298-1-arnd@arndb.de> X-Provags-ID: V03:K0:CyoXghO2VmLlcH4sBC4eMM3slR8IzF47MbJXmYUD9nkb5ZBaf1i bPuRf/UOnuR58bryMqfBnmGU7SSvu1PZwRX/0DVC+YW0xrU0a2mIl5wuXNGD8LKxy3mgEVu wi6/fC3B6EtSlPDW7pEjb0lkPNuoFZGHNkl08up0IqL5Vu61zCxpv9Cw7pMt/idPL1mDNaR vOvhJjXkGG7rpDbiXmiMQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:3zDecCDqhno=:iSN82U/MSJH7hRN8W0PhiI r5ZsPkq2hfGc5BillJ0IWPmKOArIuqzRxsrufmnkNUf+SLnr3Ws2RzVla9/hVltRjsjzm13k+ rEZWsq8Ow7RwwECJ3nklXd0QiveVVgFc/HVJkrMu7+TvBShVEWXi0FPRt/w+2fIpMbcJyUMtu 1qRkXrTiMYS1D9nO5HEU2HMqNekt0aC430tfu9M+9DSuLDObVxbbPNhHpc2M46wM//Vl/0Pup yUL7wjnz3mD0hz/YcRDVPOO8/MXblN55CalgYFYvFisB2gCAwBP5LhfcPJZRuC2RXagMeROFy igajeCMz3RzNwt7ICtf3oNGOhuohfJ+BGPAovCp8JVttBAzDdjST8UHzKBHpdiTWtFfK9Wfd4 dlUPkkIRD+koBcQ4vlbZ2vzqFLC8Cx/WbeTJbVNr9DvPetgijLxA8lY2Tp1RU23ENnUVV7qll Xt/9lSmuihMB3PsYvKQBVwnC8GLeAYiKrvwJGXDCxclHZeuFcnjbPcgSzlzyTN3uakgWj/nCf wH2ZWVICaXpHjE4rzxbv48Tf4dyXpwIOv0i8QaS/rAW/NRRqk5vxXjVaUeEbnT0H/8QBA6jVW GqJ0GMLMLMpJwdmkd74LUAXQqra2djAOPBjroTYIyJDdtt3F6oY3hD2ZC6//1FENXDSPRDmfd qHrBdjjtb94HWPSniXnC7fb2mIn74sDsCbbtGctUuleb4ZZImYB/aVgg5aT99B/JQmfg= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Paul Burton commit 2f5281ba2a8feaf6f0aee93356f350855bb530fc upstream. cpmac_start_xmit() used the max() macro on skb->len (an unsigned int) and ETH_ZLEN (a signed int literal). This led to the following compiler warning: In file included from include/linux/list.h:8:0, from include/linux/module.h:9, from drivers/net/ethernet/ti/cpmac.c:19: drivers/net/ethernet/ti/cpmac.c: In function 'cpmac_start_xmit': include/linux/kernel.h:748:17: warning: comparison of distinct pointer types lacks a cast (void) (&_max1 == &_max2); \ ^ drivers/net/ethernet/ti/cpmac.c:560:8: note: in expansion of macro 'max' len = max(skb->len, ETH_ZLEN); ^ On top of this, it assigned the result of the max() macro to a signed integer whilst all further uses of it result in it being cast to varying widths of unsigned integer. Fix this up by using max_t to ensure the comparison is performed as unsigned integers, and for consistency change the type of the len variable to unsigned int. Signed-off-by: Paul Burton Signed-off-by: David S. Miller Cc: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/ti/cpmac.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/drivers/net/ethernet/ti/cpmac.c b/drivers/net/ethernet/ti/cpmac.c index 44d5a7bee0d7..755ddd586189 100644 --- a/drivers/net/ethernet/ti/cpmac.c +++ b/drivers/net/ethernet/ti/cpmac.c @@ -543,7 +543,8 @@ fatal_error: static int cpmac_start_xmit(struct sk_buff *skb, struct net_device *dev) { - int queue, len; + int queue; + unsigned int len; struct cpmac_desc *desc; struct cpmac_priv *priv = netdev_priv(dev); @@ -553,7 +554,7 @@ static int cpmac_start_xmit(struct sk_buff *skb, struct net_device *dev) if (unlikely(skb_padto(skb, ETH_ZLEN))) return NETDEV_TX_OK; - len = max(skb->len, ETH_ZLEN); + len = max_t(unsigned int, skb->len, ETH_ZLEN); queue = skb_get_queue_mapping(skb); netif_stop_subqueue(dev, queue);