lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Thu, 20 Sep 2018 20:32:49 +0800 From: YueHaibing <yuehaibing@...wei.com> To: <davem@...emloft.net>, <dmitry.tarnyagin@...kless.no>, <wg@...ndegger.com>, <mkl@...gutronix.de>, <michal.simek@...inx.com>, <hsweeten@...ionengravers.com>, <madalin.bucur@....com>, <pantelis.antoniou@...il.com>, <claudiu.manoil@....com>, <leoyang.li@....com>, <linux@...linux.org.uk>, <sammy@...my.net>, <ralf@...ux-mips.org>, <nico@...xnic.net>, <steve.glendinning@...well.net>, <f.fainelli@...il.com>, <grygorii.strashko@...com>, <w-kwok2@...com>, <m-karicheri2@...com>, <t.sailer@...mni.ethz.ch>, <jreuter@...na.de>, <kys@...rosoft.com>, <haiyangz@...rosoft.com>, <wei.liu2@...rix.com>, <paul.durrant@...rix.com>, <arvid.brodin@...en.se>, <pshelar@....org> CC: <linux-kernel@...r.kernel.org>, <netdev@...r.kernel.org>, <linux-can@...r.kernel.org>, <linux-arm-kernel@...ts.infradead.org>, <linuxppc-dev@...ts.ozlabs.org>, <linux-mips@...ux-mips.org>, <linux-omap@...r.kernel.org>, <linux-hams@...r.kernel.org>, <devel@...uxdriverproject.org>, <linux-usb@...r.kernel.org>, <xen-devel@...ts.xenproject.org>, <dev@...nvswitch.org>, YueHaibing <yuehaibing@...wei.com> Subject: [PATCH net-next 05/22] net: sgi: fix return type of ndo_start_xmit function The method ndo_start_xmit() is defined as returning an 'netdev_tx_t', which is a typedef for an enum type, so make sure the implementation in this driver has returns 'netdev_tx_t' value, and change the function return type to netdev_tx_t. Found by coccinelle. Signed-off-by: YueHaibing <yuehaibing@...wei.com> --- drivers/net/ethernet/sgi/ioc3-eth.c | 4 ++-- drivers/net/ethernet/sgi/meth.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c index 18d533f..3140999 100644 --- a/drivers/net/ethernet/sgi/ioc3-eth.c +++ b/drivers/net/ethernet/sgi/ioc3-eth.c @@ -99,7 +99,7 @@ struct ioc3_private { static int ioc3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); static void ioc3_set_multicast_list(struct net_device *dev); -static int ioc3_start_xmit(struct sk_buff *skb, struct net_device *dev); +static netdev_tx_t ioc3_start_xmit(struct sk_buff *skb, struct net_device *dev); static void ioc3_timeout(struct net_device *dev); static inline unsigned int ioc3_hash(const unsigned char *addr); static inline void ioc3_stop(struct ioc3_private *ip); @@ -1390,7 +1390,7 @@ static void ioc3_remove_one(struct pci_dev *pdev) .remove = ioc3_remove_one, }; -static int ioc3_start_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t ioc3_start_xmit(struct sk_buff *skb, struct net_device *dev) { unsigned long data; struct ioc3_private *ip = netdev_priv(dev); diff --git a/drivers/net/ethernet/sgi/meth.c b/drivers/net/ethernet/sgi/meth.c index ea55abd..703fbbe 100644 --- a/drivers/net/ethernet/sgi/meth.c +++ b/drivers/net/ethernet/sgi/meth.c @@ -697,7 +697,7 @@ static void meth_add_to_tx_ring(struct meth_private *priv, struct sk_buff *skb) /* * Transmit a packet (called by the kernel) */ -static int meth_tx(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t meth_tx(struct sk_buff *skb, struct net_device *dev) { struct meth_private *priv = netdev_priv(dev); unsigned long flags; -- 1.8.3.1
Powered by blists - more mailing lists