From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: [PATCH net-next-2.6 1/3] ethtool: Change ethtool_op_set_flags to validate flags Date: Fri, 02 Jul 2010 22:07:11 -0700 (PDT) Message-ID: <20100702.220711.39188625.davem@davemloft.net> References: <1277901872.2082.10.camel@achroite.uk.solarflarecom.com> <20100702095514.7fb324c8.randy.dunlap@oracle.com> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: bhutchings@solarflare.com, netdev@vger.kernel.org, linux-net-drivers@solarflare.com, sgruszka@redhat.com, amit.salecha@qlogic.com, amwang@redhat.com, anirban.chakraborty@qlogic.com, dm@chelsio.com, scofeldm@cisco.com, vkolluri@cisco.com, roprabhu@cisco.com, e1000-devel@lists.sourceforge.net, buytenh@wantstofly.org, gallatin@myri.com, brice@myri.com, shemminger@linux-foundation.org, jgarzik@redhat.com To: randy.dunlap@oracle.com Return-path: Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:56743 "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751706Ab0GCFG6 (ORCPT ); Sat, 3 Jul 2010 01:06:58 -0400 In-Reply-To: <20100702095514.7fb324c8.randy.dunlap@oracle.com> Sender: netdev-owner@vger.kernel.org List-ID: From: Randy Dunlap Date: Fri, 2 Jul 2010 09:55:14 -0700 > On Wed, 30 Jun 2010 13:44:32 +0100 Ben Hutchings wrote: >> @@ -457,7 +457,7 @@ int ethtool_op_set_tso(struct net_device *dev, u32 data); >> u32 ethtool_op_get_ufo(struct net_device *dev); >> int ethtool_op_set_ufo(struct net_device *dev, u32 data); >> u32 ethtool_op_get_flags(struct net_device *dev); >> -int ethtool_op_set_flags(struct net_device *dev, u32 data); >> +int ethtool_op_set_flags(struct net_device *dev, u32 data, u32 supported); > > That one-line change is missing from linux-next-20100702, causing: > > drivers/infiniband/ulp/ipoib/ipoib_ethtool.c:157: warning: initialization from incompatible pointer type Strange, it's in net-next-2.6 for sure: davem@sunset:~/src/GIT/net-next-2.6$ egrep ethtool_op_set_flags include/linux/ethtool.h int ethtool_op_set_flags(struct net_device *dev, u32 data, u32 supported);