From patchwork Mon Dec 13 08:18:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoichi Yuasa X-Patchwork-Id: 75307 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 1D3CFB6F1E for ; Mon, 13 Dec 2010 19:20:20 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753307Ab0LMIUM (ORCPT ); Mon, 13 Dec 2010 03:20:12 -0500 Received: from mail-gx0-f180.google.com ([209.85.161.180]:40907 "EHLO mail-gx0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751793Ab0LMIUK (ORCPT ); Mon, 13 Dec 2010 03:20:10 -0500 Received: by gxk19 with SMTP id 19so3767689gxk.11 for ; Mon, 13 Dec 2010 00:20:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:date:from:to:cc :subject:message-id:in-reply-to:references:x-mailer:mime-version :content-type:content-transfer-encoding; bh=MCtXI35MbIKY3AZlrkE39+AjrmN8aGvtSD6fHRqy4fI=; b=NMtrPsjCJjR3POZbKIPO2CjhMJ/RUz/yS5TV3PUY1MzZDJK/LgkwkDnquVw/SwAxFT KjU5d2s1vMwKNuZ2PSTnArnq9AQsADh/mt3x8LeDmH/5NH+RbpwkNDXbA8I82kTq1poA d6GJv9xFDqn5gxh76ZkQHOG+JttUKn+NDEpmc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:date:from:to:cc:subject:message-id:in-reply-to:references :x-mailer:mime-version:content-type:content-transfer-encoding; b=Mo6RPI0MDTlkzFcTnTGO7IyUfp5coZW61DozTF7pEBnoihQfJxBH77sLAhNTJAKJkc NFL1PXFBJjBaD733V+uBuNS0b4uHT9+mooE1hdPfzfNRVkWmbEVxRVqO4Mj/gL4//Sqn 9bywxYDPnhaGLper8+gLMRdME723WWFTRDJ74= Received: by 10.90.114.1 with SMTP id m1mr2465517agc.129.1292228409481; Mon, 13 Dec 2010 00:20:09 -0800 (PST) Received: from stratos (sannin29007.nirai.ne.jp [203.160.29.7]) by mx.google.com with ESMTPS id e74sm3833805yhc.5.2010.12.13.00.20.07 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 13 Dec 2010 00:20:08 -0800 (PST) Date: Mon, 13 Dec 2010 17:18:45 +0900 From: Yoichi Yuasa To: "David S. Miller" Cc: yuasa@linux-mips.org, netdev , Eugene Konev Subject: [PATCH net-next-2.6 2/2] cpmac: fix warning length cast Message-Id: <20101213171845.39a2151f.yuasa@linux-mips.org> In-Reply-To: <20101213171725.2ed299cf.yuasa@linux-mips.org> References: <20101213171725.2ed299cf.yuasa@linux-mips.org> X-Mailer: Sylpheed 3.0.3 (GTK+ 2.16.6; x86_64-unknown-linux-gnu) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org drivers/net/cpmac.c: In function 'cpmac_start_xmit': drivers/net/cpmac.c:569: warning: comparison of distinct pointer types lacks a cast Signed-off-by: Yoichi Yuasa --- drivers/net/cpmac.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c index 8021756..3b606a5 100644 --- a/drivers/net/cpmac.c +++ b/drivers/net/cpmac.c @@ -180,7 +180,7 @@ struct cpmac_desc { u32 hw_next; u32 hw_data; u16 bufflags; - u16 datalen; + size_t datalen; u16 dataflags; #define CPMAC_SOP 0x8000 #define CPMAC_EOP 0x4000 @@ -554,7 +554,8 @@ fatal_error: static int cpmac_start_xmit(struct sk_buff *skb, struct net_device *dev) { - int queue, len; + int queue; + size_t len; struct cpmac_desc *desc; struct cpmac_priv *priv = netdev_priv(dev); @@ -564,7 +565,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(size_t, skb->len, ETH_ZLEN); queue = skb_get_queue_mapping(skb); netif_stop_subqueue(dev, queue);