net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions
Subsystems (26)
commit 42cd52fcc5c454acd1fe9dd55d6c2de5a35084dc
Author: Patrick McHardy <[email protected]> Date: Tue Jun 23 18:02:26 2009 +0200
net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions
This patch is the result of an automatic spatch transformation to convert all ndo_start_xmit() return values of 0 to NETDEV_TX_OK.
Some occurences are missed by the automatic conversion, those will be handled in a seperate patch.
Signed-off-by Patrick McHardy <[email protected]>
arch/ia64/hp/sim/simeth.c +1 -1
@@ -412,7 +412,7 @@ simeth_tx(struct sk_buff *skb, struct net_device *dev)*/ dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; } static inline struct sk_buff *
arch/um/drivers/net_kern.c +1 -1
@@ -245,7 +245,7 @@ static int uml_net_start_xmit(struct sk_buff *skb, struct net_device *dev)dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }static void uml_net_set_multicast_list (struct net_device *dev)
drivers/ieee802154/fakehard.c +1 -1
@@ -132,7 +132,7 @@ static int ieee802154_fake_xmit(struct sk_buff *skb, struct net_device *dev)/* FIXME: do hardware work here ... */ -return 0 ; +return NETDEV_TX_OK ; }
drivers/isdn/i4l/isdn_net.c +6 -6
@@ -1202,7 +1202,7 @@ isdn_net_start_xmit(struct sk_buff *skb, struct net_device *ndev)if (!(ISDN_NET_DIALMODE (*lp) ==ISDN_NET_DM_AUTO )) {isdn_net_unreachable (ndev, skb,"dial rejected: interface not in dialmode `auto'" );dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }if (lp->phone[1 ]) {ulong flags;
@@ -1215,7 +1215,7 @@ isdn_net_start_xmit(struct sk_buff *skb, struct net_device *ndev)if (time_before (jiffies, lp->dialwait_timer)) {isdn_net_unreachable (ndev, skb,"dial rejected: retry-time not reached" );dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }else lp->dialwait_timer =0 ; }
@@ -1243,7 +1243,7 @@ isdn_net_start_xmit(struct sk_buff *skb, struct net_device *ndev)isdn_net_unreachable (ndev, skb,"No channel" );dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }/* Log packet, which triggered dialing */ if (dev->net_verbose)
@@ -1258,7 +1258,7 @@ isdn_net_start_xmit(struct sk_buff *skb, struct net_device *ndev)dev_kfree_skb (skb);isdn_net_unbind_channel (lp);spin_unlock_irqrestore (&dev->lock, flags); -return 0 ;/* STN (skb to nirvana) ;) */ +return NETDEV_TX_OK ;/* STN (skb to nirvana) ;) */ }#ifdef CONFIG_IPPP_FILTER if (isdn_ppp_autodial_filter (skb, lp)) {
@@ -1267,7 +1267,7 @@ isdn_net_start_xmit(struct sk_buff *skb, struct net_device *ndev)spin_unlock_irqrestore (&dev->lock, flags);isdn_net_unreachable (ndev, skb,"dial rejected: packet filtered" );dev_kfree_skb (skb); - return 0; + return NETDEV_TX_OK; }#endif spin_unlock_irqrestore (&dev->lock, flags);
@@ -1285,7 +1285,7 @@ isdn_net_start_xmit(struct sk_buff *skb, struct net_device *ndev)isdn_net_unreachable (ndev, skb,"No phone number" );dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; } }else {/* Device is connected to an ISDN channel */
drivers/media/dvb/dvb-core/dvb_net.c +1 -1
@@ -904,7 +904,7 @@ static int dvb_net_sec_callback(const u8 *buffer1, size_t buffer1_len,static int dvb_net_tx (struct sk_buff *skb,struct net_device *dev) {dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }static u8 mask_normal[6 ]={0xff ,0xff ,0xff ,0xff ,0xff ,0xff };
drivers/message/fusion/mptlan.c +1 -1
@@ -795,7 +795,7 @@ mpt_lan_sdu_send (struct sk_buff *skb, struct net_device *dev)IOC_AND_NETDEV_NAMES_s_s (dev), le32_to_cpu(pSimple->FlagsLength))); -return 0 ; +return NETDEV_TX_OK ; }/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
drivers/misc/sgi-xp/xpnet.c +2 -2
@@ -436,7 +436,7 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)if (skb->data[0 ] ==0x33 ) {dev_kfree_skb (skb); -return 0 ;/* nothing needed to be done */ +return NETDEV_TX_OK ;/* nothing needed to be done */ }/*
@@ -503,7 +503,7 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) dev->stats.tx_packets++; dev->stats.tx_bytes += skb->len; -return 0 ; +return NETDEV_TX_OK ; }/*
drivers/net/3c505.c +1 -1
@@ -1101,7 +1101,7 @@ static int elp_start_xmit(struct sk_buff *skb, struct net_device *dev)prime_rx (dev);spin_unlock_irqrestore (&adapter->lock, flags);netif_start_queue (dev); -return 0 ; +return NETDEV_TX_OK ; }/******************************************************
drivers/net/3c507.c +1 -1
@@ -537,7 +537,7 @@ static int el16_send_packet (struct sk_buff *skb, struct net_device *dev)/* You might need to clean up and record Tx statistics here. */ -return 0 ; +return NETDEV_TX_OK ; }/* The typical workload of the driver:
drivers/net/3c509.c +1 -1
@@ -892,7 +892,7 @@ el3_start_xmit(struct sk_buff *skb, struct net_device *dev)outb (0x00 , ioaddr +TX_STATUS );/* Pop the status stack. */ } } -return 0 ; +return NETDEV_TX_OK ; }/* The EL3 interrupt handler. */
drivers/net/3c515.c +2 -2
@@ -1054,7 +1054,7 @@ static int corkscrew_start_xmit(struct sk_buff *skb,netif_wake_queue (dev); } dev->trans_start = jiffies; -return 0 ; +return NETDEV_TX_OK ; }/* Put out the doubleword header... */ outl (skb->len, ioaddr +TX_FIFO );
@@ -1117,7 +1117,7 @@ static int corkscrew_start_xmit(struct sk_buff *skb,outb (0x00 , ioaddr + TxStatus);/* Pop the status stack. */ } } -return 0 ; +return NETDEV_TX_OK ; }/* The interrupt handler does all of the Rx thread work and cleans up
drivers/net/3c523.c +1 -1
@@ -1198,7 +1198,7 @@ static int elmc_send_packet(struct sk_buff *skb, struct net_device *dev)netif_wake_queue (dev);dev_kfree_skb (skb);#endif -return 0 ; +return NETDEV_TX_OK ; }/*******************************************
drivers/net/3c527.c +2 -2
@@ -1035,7 +1035,7 @@ static int mc32_send_packet(struct sk_buff *skb, struct net_device *dev)if (skb_padto (skb,ETH_ZLEN )) {netif_wake_queue (dev); -return 0 ; +return NETDEV_TX_OK ; }atomic_dec (&lp->tx_count);
@@ -1066,7 +1066,7 @@ static int mc32_send_packet(struct sk_buff *skb, struct net_device *dev) p->control &= ~CONTROL_EOL ;netif_wake_queue (dev); -return 0 ; +return NETDEV_TX_OK ; }
drivers/net/3c59x.c +2 -2
@@ -2083,7 +2083,7 @@ vortex_start_xmit(struct sk_buff *skb, struct net_device *dev)iowrite8 (0x00 , ioaddr + TxStatus);/* Pop the status stack. */ } } -return 0 ; +return NETDEV_TX_OK ; } static int
@@ -2173,7 +2173,7 @@ boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev)iowrite16 (DownUnstall, ioaddr +EL3_CMD );spin_unlock_irqrestore (&vp->lock, flags); dev->trans_start = jiffies; -return 0 ; +return NETDEV_TX_OK ; }/* The interrupt handler does all of the Rx thread work and cleans up
drivers/net/8139cp.c +1 -1
@@ -891,7 +891,7 @@ static int cp_start_xmit (struct sk_buff *skb, struct net_device *dev)cpw8 (TxPoll, NormalTxPoll); dev->trans_start = jiffies; -return 0 ; +return NETDEV_TX_OK ; }/* Set or clear the multicast filter for this adaptor.
drivers/net/8139too.c +2 -2
@@ -1706,7 +1706,7 @@ static int rtl8139_start_xmit (struct sk_buff *skb, struct net_device *dev) }else {dev_kfree_skb (skb); dev->stats.tx_dropped++; -return 0 ; +return NETDEV_TX_OK ; }spin_lock_irqsave (&tp->lock, flags);
@@ -1731,7 +1731,7 @@ static int rtl8139_start_xmit (struct sk_buff *skb, struct net_device *dev)pr_debug ("%s: Queued Tx packet size %u to slot %d.\n" , dev->name, len, entry); -return 0 ; +return NETDEV_TX_OK ; }
drivers/net/82596.c +2 -2
@@ -1068,7 +1068,7 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev)if (skb->len <ETH_ZLEN ) {if (skb_padto (skb,ETH_ZLEN )) -return 0 ; +return NETDEV_TX_OK ; length =ETH_ZLEN ; }netif_stop_queue (dev);
@@ -1110,7 +1110,7 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev)netif_start_queue (dev); -return 0 ; +return NETDEV_TX_OK ; }static void print_eth (unsigned char *add,char *str)
drivers/net/amd8111e.c +1 -1
@@ -1346,7 +1346,7 @@ static int amd8111e_start_xmit(struct sk_buff *skb, struct net_device * dev)netif_stop_queue (dev); }spin_unlock_irqrestore (&lp->lock, flags); -return 0 ; +return NETDEV_TX_OK ; }/* This function returns all the memory mapped registers of the device.
drivers/net/appletalk/cops.c +1 -1
@@ -920,7 +920,7 @@ static int cops_send_packet(struct sk_buff *skb, struct net_device *dev) dev->stats.tx_bytes += skb->len; dev->trans_start = jiffies;dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }/*
drivers/net/appletalk/ipddp.c +2 -2
@@ -132,7 +132,7 @@ static int ipddp_xmit(struct sk_buff *skb, struct net_device *dev) }if (rt ==NULL ) {spin_unlock (&ipddp_route_lock); -return 0 ; +return NETDEV_TX_OK ; } our_addr =atalk_find_dev_addr (rt->dev);
@@ -181,7 +181,7 @@ static int ipddp_xmit(struct sk_buff *skb, struct net_device *dev)spin_unlock (&ipddp_route_lock); -return 0 ; +return NETDEV_TX_OK ; }/*
drivers/net/appletalk/ltpc.c +1 -1
@@ -932,7 +932,7 @@ static int ltpc_xmit(struct sk_buff *skb, struct net_device *dev) dev->stats.tx_bytes += skb->len;dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }/* initialization stuff */
drivers/net/ariadne.c +2 -2
@@ -610,7 +610,7 @@ static int ariadne_start_xmit(struct sk_buff *skb, struct net_device *dev)if (skb->len <ETH_ZLEN ) {if (skb_padto (skb,ETH_ZLEN )) -return 0 ; +return NETDEV_TX_OK ; len =ETH_ZLEN ; }
@@ -685,7 +685,7 @@ static int ariadne_start_xmit(struct sk_buff *skb, struct net_device *dev) }local_irq_restore (flags); -return 0 ; +return NETDEV_TX_OK ; }
drivers/net/arm/am79c961a.c +1 -1
@@ -482,7 +482,7 @@ am79c961_sendpacket(struct sk_buff *skb, struct net_device *dev)dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }/*
drivers/net/arm/at91_ether.c +1 -1
@@ -834,7 +834,7 @@ static int at91ether_start_xmit(struct sk_buff *skb, struct net_device *dev)we free and return(0) or don't free and return 1 */ } -return 0 ; +return NETDEV_TX_OK ; }/*
drivers/net/arm/ether1.c +1 -1
@@ -748,7 +748,7 @@ ether1_sendpacket (struct sk_buff *skb, struct net_device *dev)netif_stop_queue (dev); out: -return 0 ; +return NETDEV_TX_OK ; } static void
drivers/net/arm/ether3.c +2 -2
@@ -511,7 +511,7 @@ ether3_sendpacket(struct sk_buff *skb, struct net_device *dev)dev_kfree_skb (skb);priv (dev)->stats.tx_dropped ++;netif_start_queue (dev); -return 0 ; +return NETDEV_TX_OK ; } length = (length +1 ) & ~1 ;
@@ -562,7 +562,7 @@ ether3_sendpacket(struct sk_buff *skb, struct net_device *dev)netif_stop_queue (dev); out: -return 0 ; +return NETDEV_TX_OK ; } static irqreturn_t
drivers/net/at1700.c +1 -1
@@ -643,7 +643,7 @@ static int net_send_packet (struct sk_buff *skb, struct net_device *dev)netif_start_queue (dev);dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }/* The typical workload of the driver:
drivers/net/atarilance.c +2 -2
@@ -796,7 +796,7 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev )if (len > skb->len) {if (skb_padto (skb, len)) -return 0 ; +return NETDEV_TX_OK ; }netif_stop_queue (dev);
@@ -846,7 +846,7 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev ) lp->tx_full =1 ;spin_unlock_irqrestore (&lp->devlock, flags); -return 0 ; +return NETDEV_TX_OK ; }/* The LANCE interrupt handler. */
drivers/net/atp.c +1 -1
@@ -587,7 +587,7 @@ static int atp_send_packet(struct sk_buff *skb, struct net_device *dev) dev->trans_start = jiffies;dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }
drivers/net/au1000_eth.c +1 -1
@@ -988,7 +988,7 @@ static int au1000_tx(struct sk_buff *skb, struct net_device *dev)dev_kfree_skb (skb); aup->tx_head = (aup->tx_head +1 ) & (NUM_TX_DMA -1 ); dev->trans_start = jiffies; -return 0 ; +return NETDEV_TX_OK ; }/*
drivers/net/bfin_mac.c +1 -1
@@ -656,7 +656,7 @@ out: dev->trans_start = jiffies; dev->stats.tx_packets++; dev->stats.tx_bytes += (skb->len); -return 0 ; +return NETDEV_TX_OK ; }static void bfin_mac_rx (struct net_device *dev)
drivers/net/bmac.c +1 -1
@@ -1488,7 +1488,7 @@ bmac_output(struct sk_buff *skb, struct net_device *dev)struct bmac_data *bp =netdev_priv (dev);skb_queue_tail (bp->queue, skb);bmac_start (dev); -return 0 ; +return NETDEV_TX_OK ; }static void bmac_tx_timeout (unsigned long data)
drivers/net/can/sja1000/sja1000.c +1 -1
@@ -283,7 +283,7 @@ static int sja1000_start_xmit(struct sk_buff *skb, struct net_device *dev) priv->write_reg (priv,REG_CMR ,CMD_TR ); -return 0 ; +return NETDEV_TX_OK ; }static void sja1000_rx (struct net_device *dev)
drivers/net/cassini.c +2 -2
@@ -2928,7 +2928,7 @@ static int cas_start_xmit(struct sk_buff *skb, struct net_device *dev)static int ring;if (skb_padto (skb, cp->min_frame_size)) -return 0 ; +return NETDEV_TX_OK ;/* XXX: we need some higher-level QoS hooks to steer packets to * individual queues.
@@ -2936,7 +2936,7 @@ static int cas_start_xmit(struct sk_buff *skb, struct net_device *dev)if (cas_xmit_tx_ringN (cp, ring++ &N_TX_RINGS_MASK , skb))return NETDEV_TX_BUSY ; dev->trans_start = jiffies; -return 0 ; +return NETDEV_TX_OK ; }static void cas_init_tx_dma (struct cas *cp)
drivers/net/cris/eth_v10.c +1 -1
@@ -1108,7 +1108,7 @@ e100_send_packet(struct sk_buff *skb, struct net_device *dev)spin_unlock_irqrestore (&np->lock, flags); -return 0 ; +return NETDEV_TX_OK ; }/*
drivers/net/cs89x0.c +1 -1
@@ -1571,7 +1571,7 @@ static int net_send_packet(struct sk_buff *skb, struct net_device *dev)* to restart the netdevice layer */ -return 0 ; +return NETDEV_TX_OK ; }/* The typical workload of the driver:
drivers/net/de600.c +1 -1
@@ -226,7 +226,7 @@ static int de600_start_xmit(struct sk_buff *skb, struct net_device *dev) }spin_unlock_irqrestore (&de600_lock, flags);dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }/*
drivers/net/de620.c +1 -1
@@ -542,7 +542,7 @@ static int de620_start_xmit(struct sk_buff *skb, struct net_device *dev) dev->stats.tx_packets++;spin_unlock_irqrestore (&de620_lock, flags);dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }/*****************************************************
drivers/net/declance.c +2 -2
@@ -902,7 +902,7 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev)if (len <ETH_ZLEN ) {if (skb_padto (skb,ETH_ZLEN )) -return 0 ; +return NETDEV_TX_OK ; len =ETH_ZLEN ; }
@@ -933,7 +933,7 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev) dev->trans_start = jiffies;dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }static void lance_load_multicast (struct net_device *dev)
drivers/net/dm9000.c +1 -1
@@ -788,7 +788,7 @@ dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev)/* free this SKB */ dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }/*
drivers/net/dnet.c +1 -1
@@ -596,7 +596,7 @@ static int dnet_start_xmit(struct sk_buff *skb, struct net_device *dev) dev->trans_start = jiffies; -return 0 ; +return NETDEV_TX_OK ; }static void dnet_reset_hw (struct dnet *bp)
drivers/net/dummy.c +1 -1
@@ -85,7 +85,7 @@ static int dummy_xmit(struct sk_buff *skb, struct net_device *dev) dev->stats.tx_bytes += skb->len;dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }static int dummy_validate (struct nlattr *tb[],struct nlattr *data[])
drivers/net/e100.c +1 -1
@@ -1720,7 +1720,7 @@ static int e100_xmit_frame(struct sk_buff *skb, struct net_device *netdev) } netdev->trans_start = jiffies; -return 0 ; +return NETDEV_TX_OK ; }static int e100_tx_clean (struct nic *nic)
drivers/net/eepro.c +2 -2
@@ -1145,7 +1145,7 @@ static int eepro_send_packet(struct sk_buff *skb, struct net_device *dev)if (length <ETH_ZLEN ) {if (skb_padto (skb,ETH_ZLEN )) -return 0 ; +return NETDEV_TX_OK ; length =ETH_ZLEN ; }netif_stop_queue (dev);
@@ -1178,7 +1178,7 @@ static int eepro_send_packet(struct sk_buff *skb, struct net_device *dev)eepro_en_int (ioaddr);spin_unlock_irqrestore (&lp->lock, flags); -return 0 ; +return NETDEV_TX_OK ; }
drivers/net/eexpress.c +2 -2
@@ -664,7 +664,7 @@ static int eexp_xmit(struct sk_buff *buf, struct net_device *dev)if (buf->len <ETH_ZLEN ) {if (skb_padto (buf,ETH_ZLEN )) -return 0 ; +return NETDEV_TX_OK ; length =ETH_ZLEN ; }
@@ -691,7 +691,7 @@ static int eexp_xmit(struct sk_buff *buf, struct net_device *dev)spin_unlock_irqrestore (&lp->lock, flags);#endif enable_irq (dev->irq); -return 0 ; +return NETDEV_TX_OK ; }/*
drivers/net/enc28j60.c +1 -1
@@ -1299,7 +1299,7 @@ static int enc28j60_send_packet(struct sk_buff *skb, struct net_device *dev) priv->tx_skb = skb;schedule_work (&priv->tx_work); -return 0 ; +return NETDEV_TX_OK ; }static void enc28j60_tx_work_handler (struct work_struct *work)
drivers/net/epic100.c +2 -2
@@ -970,7 +970,7 @@ static int epic_start_xmit(struct sk_buff *skb, struct net_device *dev)unsigned long flags;if (skb_padto (skb,ETH_ZLEN )) -return 0 ; +return NETDEV_TX_OK ;/* Caution: the write order is important here, set the field with the "ownership" bit last. */
@@ -1014,7 +1014,7 @@ static int epic_start_xmit(struct sk_buff *skb, struct net_device *dev) dev->name, (int )skb->len, entry, ctrl_word, (int)inl(dev->base_addr + TxSTAT)); -return 0 ; +return NETDEV_TX_OK ; } static void epic_tx_error(struct net_device *dev, struct epic_private *ep,
drivers/net/eql.c +1 -1
@@ -348,7 +348,7 @@ static int eql_slave_xmit(struct sk_buff *skb, struct net_device *dev)spin_unlock (&eql->queue.lock); -return 0 ; +return NETDEV_TX_OK ; }/*
drivers/net/eth16i.c +2 -2
@@ -1064,7 +1064,7 @@ static int eth16i_tx(struct sk_buff *skb, struct net_device *dev)if (length <ETH_ZLEN ) {if (skb_padto (skb,ETH_ZLEN )) -return 0 ; +return NETDEV_TX_OK ; length =ETH_ZLEN ; } buf = skb->data;
@@ -1126,7 +1126,7 @@ static int eth16i_tx(struct sk_buff *skb, struct net_device *dev)/* outb(TX_INTR_DONE | TX_INTR_16_COL, ioaddr + TX_INTR_REG); */ status =0 ;dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }static void eth16i_rx (struct net_device *dev)
drivers/net/ewrk3.c +1 -1
@@ -868,7 +868,7 @@ static int ewrk3_queue_pkt (struct sk_buff *skb, struct net_device *dev)if (inb (EWRK3_FMQC ) ==0 )netif_stop_queue (dev); -return 0 ; +return NETDEV_TX_OK ; err_out: ENABLE_IRQs;
drivers/net/fealnx.c +1 -1
@@ -1374,7 +1374,7 @@ static int start_tx(struct sk_buff *skb, struct net_device *dev) dev->trans_start = jiffies;spin_unlock_irqrestore (&np->lock, flags); -return 0 ; +return NETDEV_TX_OK ; }
drivers/net/fec.c +1 -1
@@ -366,7 +366,7 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)spin_unlock_irqrestore (&fep->hw_lock, flags); -return 0 ; +return NETDEV_TX_OK ; } static void
drivers/net/hamachi.c +1 -1
@@ -1369,7 +1369,7 @@ static int hamachi_start_xmit(struct sk_buff *skb, struct net_device *dev)printk (KERN_DEBUG "%s: Hamachi transmit frame #%d queued in slot %d.\n" , dev->name, hmp->cur_tx, entry); } -return 0 ; +return NETDEV_TX_OK ; }/* The interrupt handler does all of the Rx thread work and cleans up
drivers/net/hamradio/6pack.c +1 -1
@@ -255,7 +255,7 @@ static int sp_xmit(struct sk_buff *skb, struct net_device *dev)dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }static int sp_open_dev (struct net_device *dev)
drivers/net/hamradio/baycom_epp.c +3 -3
@@ -774,18 +774,18 @@ static int baycom_send_packet(struct sk_buff *skb, struct net_device *dev)if (skb->data[0 ] !=0 ) {do_kiss_params (bc, skb->data, skb->len);dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }if (bc->skb)return NETDEV_TX_LOCKED ;/* strip KISS byte */ if (skb->len >=HDLCDRV_MAXFLEN +1 || skb->len <3 ) {dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }netif_stop_queue (dev); bc->skb = skb; -return 0 ; +return NETDEV_TX_OK ; }/* --------------------------------------------------------------------- */
drivers/net/hamradio/bpqether.c +1 -1
@@ -305,7 +305,7 @@ static int bpq_xmit(struct sk_buff *skb, struct net_device *dev)dev_queue_xmit (skb);netif_wake_queue (dev); -return 0 ; +return NETDEV_TX_OK ; }/*
drivers/net/hamradio/dmascc.c +1 -1
@@ -959,7 +959,7 @@ static int scc_send_packet(struct sk_buff *skb, struct net_device *dev)spin_unlock_irqrestore (&priv->ring_lock, flags);dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }
drivers/net/hamradio/hdlcdrv.c +2 -2
@@ -406,13 +406,13 @@ static int hdlcdrv_send_packet(struct sk_buff *skb, struct net_device *dev)if (skb->data[0 ] !=0 ) {do_kiss_params (sm, skb->data, skb->len);dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }if (sm->skb)return NETDEV_TX_LOCKED ;netif_stop_queue (dev); sm->skb = skb; -return 0 ; +return NETDEV_TX_OK ; }/* --------------------------------------------------------------------- */
drivers/net/hamradio/mkiss.c +1 -1
@@ -560,7 +560,7 @@ static int ax_xmit(struct sk_buff *skb, struct net_device *dev)kfree_skb (skb); } -return 0 ; +return NETDEV_TX_OK ; }static int ax_open_dev (struct net_device *dev)
drivers/net/hamradio/scc.c +3 -3
@@ -1643,7 +1643,7 @@ static int scc_net_tx(struct sk_buff *skb, struct net_device *dev)if (skb->len > scc->stat.bufsize || skb->len <2 ) { scc->dev_stat.tx_dropped++;/* bogus frame */ dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; } scc->dev_stat.tx_packets++;
@@ -1656,7 +1656,7 @@ static int scc_net_tx(struct sk_buff *skb, struct net_device *dev)if (kisscmd) {scc_set_param (scc, kisscmd, *skb->data);dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }spin_lock_irqsave (&scc->lock, flags);
@@ -1684,7 +1684,7 @@ static int scc_net_tx(struct sk_buff *skb, struct net_device *dev)__scc_start_tx_timer (scc, t_dwait,0 ); }spin_unlock_irqrestore (&scc->lock, flags); -return 0 ; +return NETDEV_TX_OK ; }/* ----> ioctl functions <---- */
drivers/net/hamradio/yam.c +1 -1
@@ -600,7 +600,7 @@ static int yam_send_packet(struct sk_buff *skb, struct net_device *dev)skb_queue_tail (&yp->send_queue, skb); dev->trans_start = jiffies; -return 0 ; +return NETDEV_TX_OK ; }static void yam_start_tx (struct net_device *dev,struct yam_port *yp)
drivers/net/hp100.c +3 -3
@@ -1499,7 +1499,7 @@ static int hp100_start_xmit_bm(struct sk_buff *skb, struct net_device *dev) goto drop;if (lp->chip ==HP100_CHIPID_SHASTA &&skb_padto (skb,ETH_ZLEN )) -return 0 ; +return NETDEV_TX_OK ;/* Get Tx ring tail pointer */ if (lp->txrtail->next == lp->txrhead) {
@@ -1585,7 +1585,7 @@ static int hp100_start_xmit_bm(struct sk_buff *skb, struct net_device *dev) lp->stats.tx_bytes += skb->len; dev->trans_start = jiffies; -return 0 ; +return NETDEV_TX_OK ; drop:dev_kfree_skb (skb);
@@ -1752,7 +1752,7 @@ static int hp100_start_xmit(struct sk_buff *skb, struct net_device *dev)printk ("hp100: %s: start_xmit: end\n" , dev->name);#endif -return 0 ; +return NETDEV_TX_OK ; drop:dev_kfree_skb (skb);
drivers/net/ibmveth.c +1 -1
@@ -971,7 +971,7 @@ out: spin_lock_irqsave(&adapter->stats_lock, flags);spin_unlock_irqrestore (&adapter->stats_lock, flags);dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }static int ibmveth_poll (struct napi_struct *napi,int budget)
drivers/net/ioc3-eth.c +1 -1
@@ -1515,7 +1515,7 @@ static int ioc3_start_xmit(struct sk_buff *skb, struct net_device *dev)spin_unlock_irq (&ip->ioc3_lock); -return 0 ; +return NETDEV_TX_OK ; }static void ioc3_timeout (struct net_device *dev)
drivers/net/irda/ali-ircc.c +4 -4
@@ -1466,7 +1466,7 @@ static int ali_ircc_fir_hard_xmit(struct sk_buff *skb, struct net_device *dev) dev->trans_start = jiffies;spin_unlock_irqrestore (&self->lock, flags);dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }else self->new_speed = speed; }
@@ -1577,7 +1577,7 @@ static int ali_ircc_fir_hard_xmit(struct sk_buff *skb, struct net_device *dev)dev_kfree_skb (skb);IRDA_DEBUG (1 ,"%s(), ----------------- End ------------------\n" , __func__ ); -return 0 ; +return NETDEV_TX_OK ; }
@@ -1991,7 +1991,7 @@ static int ali_ircc_sir_hard_xmit(struct sk_buff *skb, struct net_device *dev) dev->trans_start = jiffies;spin_unlock_irqrestore (&self->lock, flags);dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }else self->new_speed = speed; }
@@ -2015,7 +2015,7 @@ static int ali_ircc_sir_hard_xmit(struct sk_buff *skb, struct net_device *dev)IRDA_DEBUG (2 ,"%s(), ----------------- End ------------------\n" , __func__ ); -return 0 ; +return NETDEV_TX_OK ; }
drivers/net/irda/au1k_ir.c +2 -2
@@ -502,7 +502,7 @@ static int au1k_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev) aup->newspeed =0 ; }dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; } ptxd = aup->tx_ring[aup->tx_head];
@@ -555,7 +555,7 @@ static int au1k_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev)dev_kfree_skb (skb); aup->tx_head = (aup->tx_head +1 ) & (NUM_IR_DESC -1 ); dev->trans_start = jiffies; -return 0 ; +return NETDEV_TX_OK ; }
drivers/net/irda/donauboe.c +3 -3
@@ -1021,7 +1021,7 @@ toshoboe_hard_xmit (struct sk_buff *skb, struct net_device *dev) {spin_unlock_irqrestore (&self->spinlock, flags);dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }/* True packet, go on, but */ /* do not accept anything before change speed execution */
@@ -1036,7 +1036,7 @@ toshoboe_hard_xmit (struct sk_buff *skb, struct net_device *dev)toshoboe_setbaud (self);spin_unlock_irqrestore (&self->spinlock, flags);dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; } }
@@ -1143,7 +1143,7 @@ dumpbufs(skb->data,skb->len,'>');spin_unlock_irqrestore (&self->spinlock, flags);dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }/*interrupt handler */
drivers/net/irda/irda-usb.c +1 -1
@@ -534,7 +534,7 @@ static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *netdev) }spin_unlock_irqrestore (&self->lock, flags); -return 0 ; +return NETDEV_TX_OK ; drop:/* Drop silently the skb and exit */
drivers/net/irda/nsc-ircc.c +4 -4
@@ -1397,7 +1397,7 @@ static int nsc_ircc_hard_xmit_sir(struct sk_buff *skb, struct net_device *dev) dev->trans_start = jiffies;spin_unlock_irqrestore (&self->lock, flags);dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }else self->new_speed = speed; }
@@ -1424,7 +1424,7 @@ static int nsc_ircc_hard_xmit_sir(struct sk_buff *skb, struct net_device *dev)dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }static int nsc_ircc_hard_xmit_fir (struct sk_buff *skb,struct net_device *dev)
@@ -1467,7 +1467,7 @@ static int nsc_ircc_hard_xmit_fir(struct sk_buff *skb, struct net_device *dev) dev->trans_start = jiffies;spin_unlock_irqrestore (&self->lock, flags);dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }else {/* Change speed after current frame */ self->new_speed = speed;
@@ -1554,7 +1554,7 @@ static int nsc_ircc_hard_xmit_fir(struct sk_buff *skb, struct net_device *dev)spin_unlock_irqrestore (&self->lock, flags);dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }/*
drivers/net/irda/pxaficp_ir.c +2 -2
@@ -504,7 +504,7 @@ static int pxa_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev)pxa_irda_set_speed (si, speed); }dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }netif_stop_queue (dev);
@@ -539,7 +539,7 @@ static int pxa_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev)dev_kfree_skb (skb); dev->trans_start = jiffies; -return 0 ; +return NETDEV_TX_OK ; }static int pxa_irda_ioctl (struct net_device *dev,struct ifreq *ifreq,int cmd)
drivers/net/irda/sa1100_ir.c +2 -2
@@ -667,7 +667,7 @@ static int sa1100_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev)sa1100_irda_set_speed (si, speed); }dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }if (!IS_FIR (si)) {
@@ -715,7 +715,7 @@ static int sa1100_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev) dev->trans_start = jiffies; -return 0 ; +return NETDEV_TX_OK ; } static int
drivers/net/irda/sir_dev.c +2 -2
@@ -621,7 +621,7 @@ static int sirdev_hard_xmit(struct sk_buff *skb, struct net_device *ndev)*/ dev_kfree_skb_any (skb); -return 0 ; +return NETDEV_TX_OK ; }else dev->new_speed = speed; }
@@ -668,7 +668,7 @@ static int sirdev_hard_xmit(struct sk_buff *skb, struct net_device *ndev) }spin_unlock_irqrestore (&dev->tx_lock, flags); -return 0 ; +return NETDEV_TX_OK ; }/* called from network layer with rtnl hold */
drivers/net/irda/stir4200.c +1 -1
@@ -578,7 +578,7 @@ static int stir_hard_xmit(struct sk_buff *skb, struct net_device *netdev)dev_kfree_skb (skb); } -return 0 ; +return NETDEV_TX_OK ; }/*
drivers/net/irda/via-ircc.c +5 -5
@@ -844,7 +844,7 @@ static int via_ircc_hard_xmit_sir(struct sk_buff *skb,via_ircc_change_speed (self, speed); dev->trans_start = jiffies;dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }else self->new_speed = speed; }
@@ -892,7 +892,7 @@ static int via_ircc_hard_xmit_sir(struct sk_buff *skb, dev->trans_start = jiffies;spin_unlock_irqrestore (&self->lock, flags);dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; } static int via_ircc_hard_xmit_fir(struct sk_buff *skb,
@@ -907,7 +907,7 @@ static int via_ircc_hard_xmit_fir(struct sk_buff *skb, iobase = self->io.fir_base;if (self->st_fifo.len) -return 0 ; +return NETDEV_TX_OK ;if (self->chip_id ==0x3076 )iodelay (1500 );else
@@ -919,7 +919,7 @@ static int via_ircc_hard_xmit_fir(struct sk_buff *skb,via_ircc_change_speed (self, speed); dev->trans_start = jiffies;dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }else self->new_speed = speed; }
@@ -940,7 +940,7 @@ static int via_ircc_hard_xmit_fir(struct sk_buff *skb, dev->trans_start = jiffies;dev_kfree_skb (skb);spin_unlock_irqrestore (&self->lock, flags); -return 0 ; +return NETDEV_TX_OK ; }
drivers/net/irda/vlsi_ir.c +3 -3
@@ -915,7 +915,7 @@ static int vlsi_hard_start_xmit(struct sk_buff *skb, struct net_device *ndev)*/ spin_unlock_irqrestore (&idev->lock, flags);dev_kfree_skb_any (skb); -return 0 ; +return NETDEV_TX_OK ; }/* sanity checks - simply drop the packet */
@@ -1044,7 +1044,7 @@ static int vlsi_hard_start_xmit(struct sk_buff *skb, struct net_device *ndev) }spin_unlock_irqrestore (&idev->lock, flags); -return 0 ; +return NETDEV_TX_OK ; drop_unlock:spin_unlock_irqrestore (&idev->lock, flags);
@@ -1058,7 +1058,7 @@ drop:* packet for later retry of transmission - which isn't exactly * what we want after we've just called dev_kfree_skb_any ;-) */ -return 0 ; +return NETDEV_TX_OK ; }static void vlsi_tx_interrupt (struct net_device *ndev)
drivers/net/irda/w83977af_ir.c +2 -2
@@ -516,7 +516,7 @@ static int w83977af_hard_xmit(struct sk_buff *skb, struct net_device *dev)w83977af_change_speed (self, speed); dev->trans_start = jiffies;dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }else self->new_speed = speed; }
@@ -576,7 +576,7 @@ static int w83977af_hard_xmit(struct sk_buff *skb, struct net_device *dev)/* Restore set register */ outb (set, iobase+SSR ); -return 0 ; +return NETDEV_TX_OK ; }/*
drivers/net/isa-skeleton.c +1 -1
@@ -467,7 +467,7 @@ static int net_send_packet(struct sk_buff *skb, struct net_device *dev)dev_kfree_skb (skb);#endif -return 0 ; +return NETDEV_TX_OK ; }#if TX_RING
drivers/net/iseries_veth.c +2 -2
@@ -1205,7 +1205,7 @@ static int veth_start_xmit(struct sk_buff *skb, struct net_device *dev)if ( ! ((1 << rlp) & port->lpar_map) ) {dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; } lpmask =1 << rlp;
@@ -1217,7 +1217,7 @@ static int veth_start_xmit(struct sk_buff *skb, struct net_device *dev)dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }/* You must hold the connection's lock when you call this function. */
drivers/net/ixgb/ixgb_main.c +1 -1
@@ -1459,7 +1459,7 @@ ixgb_xmit_frame(struct sk_buff *skb, struct net_device *netdev)if (skb->len <=0 ) {dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; } if (unlikely(ixgb_maybe_stop_tx(netdev, &adapter->tx_ring,
drivers/net/ixp2000/ixpdev.c +2 -2
@@ -45,7 +45,7 @@ static int ixpdev_xmit(struct sk_buff *skb, struct net_device *dev)if (unlikely (skb->len >PAGE_SIZE )) {/* @@@ Count drops. */ dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; } entry = tx_pointer;
@@ -69,7 +69,7 @@ static int ixpdev_xmit(struct sk_buff *skb, struct net_device *dev)netif_stop_queue (dev);local_irq_enable (); -return 0 ; +return NETDEV_TX_OK ; }
drivers/net/lance.c +1 -1
@@ -1016,7 +1016,7 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev) out:spin_unlock_irqrestore (&lp->devlock, flags); -return 0 ; +return NETDEV_TX_OK ; }/* The LANCE interrupt handler. */
drivers/net/lib82596.c +2 -2
@@ -983,7 +983,7 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev)if (length <ETH_ZLEN ) {if (skb_padto (skb,ETH_ZLEN )) -return 0 ; +return NETDEV_TX_OK ; length =ETH_ZLEN ; }
@@ -1028,7 +1028,7 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev)netif_start_queue (dev); -return 0 ; +return NETDEV_TX_OK ; }static void print_eth (unsigned char *add,char *str)
drivers/net/ll_temac_main.c +1 -1
@@ -591,7 +591,7 @@ static int temac_start_xmit(struct sk_buff *skb, struct net_device *ndev)/* Kick off the transfer */ temac_dma_out32 (lp,TX_TAILDESC_PTR , tail_p);/* DMA start */ -return 0 ; +return NETDEV_TX_OK ; }
drivers/net/loopback.c +1 -1
@@ -89,7 +89,7 @@ static int loopback_xmit(struct sk_buff *skb, struct net_device *dev) }else lb_stats->drops++; -return 0 ; +return NETDEV_TX_OK ; }static struct net_device_stats *loopback_get_stats (struct net_device *dev)
drivers/net/lp486e.c +2 -2
@@ -871,7 +871,7 @@ static int i596_start_xmit (struct sk_buff *skb, struct net_device *dev) {if (length <ETH_ZLEN ) {if (skb_padto (skb,ETH_ZLEN )) -return 0 ; +return NETDEV_TX_OK ; length =ETH_ZLEN ; }
@@ -906,7 +906,7 @@ static int i596_start_xmit (struct sk_buff *skb, struct net_device *dev) { dev->stats.tx_packets++; } -return 0 ; +return NETDEV_TX_OK ; } static void
drivers/net/mac89x0.c +1 -1
@@ -411,7 +411,7 @@ net_send_packet(struct sk_buff *skb, struct net_device *dev) dev->trans_start = jiffies;dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }/* The typical workload of the driver:
drivers/net/macb.c +1 -1
@@ -678,7 +678,7 @@ static int macb_start_xmit(struct sk_buff *skb, struct net_device *dev) dev->trans_start = jiffies; -return 0 ; +return NETDEV_TX_OK ; }static void macb_free_consistent (struct macb *bp)
drivers/net/mace.c +1 -1
@@ -581,7 +581,7 @@ static int mace_xmit_start(struct sk_buff *skb, struct net_device *dev)netif_stop_queue (dev);spin_unlock_irqrestore (&mp->lock, flags); -return 0 ; +return NETDEV_TX_OK ; }static void mace_set_multicast (struct net_device *dev)
drivers/net/meth.c +1 -1
@@ -715,7 +715,7 @@ static int meth_tx(struct sk_buff *skb, struct net_device *dev)spin_unlock_irqrestore (&priv->meth_lock, flags); -return 0 ; +return NETDEV_TX_OK ; }/*
drivers/net/mipsnet.c +1 -1
@@ -141,7 +141,7 @@ static int mipsnet_xmit(struct sk_buff *skb, struct net_device *dev)netif_stop_queue (dev);mipsnet_put_todevice (dev, skb); -return 0 ; +return NETDEV_TX_OK ; }static inline ssize_t mipsnet_get_fromdev (struct net_device *dev,size_t len)
drivers/net/myri10ge/myri10ge.c +3 -3
@@ -2748,7 +2748,7 @@ again:/* The packet is gone, so we must * return 0 */ ss->stats.tx_dropped +=1 ; -return 0 ; +return NETDEV_TX_OK ; }/* adjust the len to account for the zero pad * so that the nic can know how long it is */
@@ -2892,7 +2892,7 @@ again: tx->stop_queue++;netif_tx_stop_queue (netdev_queue); } -return 0 ; +return NETDEV_TX_OK ; abort_linearize:/* Free any DMA resources we've alloced and clear out the skb
@@ -2936,7 +2936,7 @@ abort_linearize: drop:dev_kfree_skb_any (skb); ss->stats.tx_dropped +=1 ; -return 0 ; +return NETDEV_TX_OK ; }
drivers/net/myri_sbus.c +1 -1
@@ -692,7 +692,7 @@ static int myri_start_xmit(struct sk_buff *skb, struct net_device *dev)DTX (("tbusy=0, returning 0\n" ));netif_start_queue (dev);spin_unlock_irqrestore (&mp->irq_lock, flags); -return 0 ; +return NETDEV_TX_OK ; }/* Create the MyriNet MAC header for an arbitrary protocol layer
drivers/net/natsemi.c +1 -1
@@ -2125,7 +2125,7 @@ static int start_tx(struct sk_buff *skb, struct net_device *dev)printk (KERN_DEBUG "%s: Transmit frame #%d queued in slot %d.\n" , dev->name, np->cur_tx, entry); } -return 0 ; +return NETDEV_TX_OK ; }static void netdev_tx_done (struct net_device *dev)
drivers/net/netx-eth.c +1 -1
@@ -134,7 +134,7 @@ netx_eth_hard_start_xmit(struct sk_buff *skb, struct net_device *ndev)spin_unlock_irq (&priv->lock);dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }static void netx_eth_receive (struct net_device *ndev)
drivers/net/ni5010.c +1 -1
@@ -463,7 +463,7 @@ static int ni5010_send_packet(struct sk_buff *skb, struct net_device *dev)hardware_send_packet (dev, (unsigned char *)skb->data, skb->len, length-skb->len); dev->trans_start = jiffies;dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }/*
drivers/net/ni65.c +1 -1
@@ -1216,7 +1216,7 @@ static int ni65_send_packet(struct sk_buff *skb, struct net_device *dev)spin_unlock_irqrestore (&p->ring_lock, flags); } -return 0 ; +return NETDEV_TX_OK ; }static void set_multicast_list (struct net_device *dev)
drivers/net/pci-skeleton.c +1 -1
@@ -1356,7 +1356,7 @@ static int netdrv_start_xmit (struct sk_buff *skb, struct net_device *dev)DPRINTK ("%s: Queued Tx packet at %p size %u to slot %d.\n" , dev->name, skb->data, skb->len, entry); -return 0 ; +return NETDEV_TX_OK ; }
drivers/net/pcmcia/3c574_cs.c +1 -1
@@ -806,7 +806,7 @@ static int el3_start_xmit(struct sk_buff *skb, struct net_device *dev)pop_tx_status (dev);spin_unlock_irqrestore (&lp->window_lock, flags);dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }/* The EL3 interrupt handler. */
drivers/net/pcmcia/3c589_cs.c +1 -1
@@ -635,7 +635,7 @@ static int el3_start_xmit(struct sk_buff *skb, struct net_device *dev)spin_unlock_irqrestore (&priv->lock, flags);dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }/* The EL3 interrupt handler. */
drivers/net/pcmcia/axnet_cs.c +1 -1
@@ -1179,7 +1179,7 @@ static int axnet_start_xmit(struct sk_buff *skb, struct net_device *dev)dev_kfree_skb (skb); dev->stats.tx_bytes += send_length; -return 0 ; +return NETDEV_TX_OK ; }/**
drivers/net/pcmcia/fmvj18x_cs.c +2 -2
@@ -865,7 +865,7 @@ static int fjn_start_xmit(struct sk_buff *skb, struct net_device *dev)if (length <ETH_ZLEN ) {if (skb_padto (skb,ETH_ZLEN )) -return 0 ; +return NETDEV_TX_OK ; length =ETH_ZLEN ; }
@@ -924,7 +924,7 @@ static int fjn_start_xmit(struct sk_buff *skb, struct net_device *dev) }dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }/* fjn_start_xmit */ /*====================================================================*/
drivers/net/pcmcia/nmclan_cs.c +1 -1
@@ -990,7 +990,7 @@ static int mace_start_xmit(struct sk_buff *skb, struct net_device *dev)dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }/* mace_start_xmit */ /* ----------------------------------------------------------------------------
drivers/net/pcmcia/smc91c92_cs.c +3 -3
@@ -1399,7 +1399,7 @@ static int smc_start_xmit(struct sk_buff *skb, struct net_device *dev)dev_kfree_skb (skb); smc->saved_skb =NULL ; dev->stats.tx_dropped++; -return 0 ;/* Do not re-queue this packet. */ +return NETDEV_TX_OK ;/* Do not re-queue this packet. */ }/* A packet is now waiting. */ smc->packets_waiting++;
@@ -1422,7 +1422,7 @@ static int smc_start_xmit(struct sk_buff *skb, struct net_device *dev)outw ((ir&0xff00 ) |IM_ALLOC_INT , ioaddr +INTERRUPT );smc_hardware_send_packet (dev);/* Send the packet now.. */ spin_unlock_irqrestore (&smc->lock, flags); -return 0 ; +return NETDEV_TX_OK ; } }
@@ -1431,7 +1431,7 @@ static int smc_start_xmit(struct sk_buff *skb, struct net_device *dev)outw ((IM_ALLOC_INT <<8 ) | (ir &0xff00 ), ioaddr +INTERRUPT );spin_unlock_irqrestore (&smc->lock, flags); -return 0 ; +return NETDEV_TX_OK ; }/*======================================================================
drivers/net/pcmcia/xirc2ps_cs.c +2 -2
@@ -1384,7 +1384,7 @@ do_start_xmit(struct sk_buff *skb, struct net_device *dev)if (pktlen <ETH_ZLEN ) {if (skb_padto (skb,ETH_ZLEN )) -return 0 ; +return NETDEV_TX_OK ; pktlen =ETH_ZLEN ; }
@@ -1414,7 +1414,7 @@ do_start_xmit(struct sk_buff *skb, struct net_device *dev) dev->trans_start = jiffies; dev->stats.tx_bytes += pktlen;netif_start_queue (dev); -return 0 ; +return NETDEV_TX_OK ; }/****************
drivers/net/pcnet32.c +1 -1
@@ -2536,7 +2536,7 @@ static int pcnet32_start_xmit(struct sk_buff *skb, struct net_device *dev)netif_stop_queue (dev); }spin_unlock_irqrestore (&lp->lock, flags); -return 0 ; +return NETDEV_TX_OK ; }/* The PCNET32 interrupt handler. */
drivers/net/plip.c +1 -1
@@ -987,7 +987,7 @@ plip_tx_packet(struct sk_buff *skb, struct net_device *dev)schedule_work (&nl->immediate);spin_unlock_irq (&nl->lock); -return 0 ; +return NETDEV_TX_OK ; } static void
drivers/net/ppp_generic.c +2 -2
@@ -988,12 +988,12 @@ ppp_start_xmit(struct sk_buff *skb, struct net_device *dev)netif_stop_queue (dev);skb_queue_tail (&ppp->file.xq, skb);ppp_xmit_process (ppp); -return 0 ; +return NETDEV_TX_OK ; outf:kfree_skb (skb); ++dev->stats.tx_dropped; -return 0 ; +return NETDEV_TX_OK ; } static int
drivers/net/rionet.c +1 -1
@@ -208,7 +208,7 @@ static int rionet_start_xmit(struct sk_buff *skb, struct net_device *ndev)spin_unlock_irqrestore (&rnet->tx_lock, flags); -return 0 ; +return NETDEV_TX_OK ; } static void rionet_dbell_event(struct rio_mport *mport, void *dev_id, u16 sid, u16 tid,
drivers/net/rrunner.c +1 -1
@@ -1466,7 +1466,7 @@ static int rr_start_xmit(struct sk_buff *skb, struct net_device *dev)spin_unlock_irqrestore (&rrpriv->lock, flags); dev->trans_start = jiffies; -return 0 ; +return NETDEV_TX_OK ; }
drivers/net/s2io.c +5 -5
@@ -4111,14 +4111,14 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)if (unlikely (skb->len <=0 )) {DBG_PRINT (TX_DBG ,"%s:Buffer has no data..\n" , dev->name);dev_kfree_skb_any (skb); -return 0 ; +return NETDEV_TX_OK ; }if (!is_s2io_card_up (sp)) {DBG_PRINT (TX_DBG ,"%s: Card going down for reset\n" , dev->name);dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; } queue =0 ;
@@ -4192,7 +4192,7 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)s2io_stop_tx_queue (sp, fifo->fifo_no);dev_kfree_skb (skb);spin_unlock_irqrestore (&fifo->tx_lock, flags); -return 0 ; +return NETDEV_TX_OK ; } offload_type =s2io_offload_type (skb);
@@ -4304,14 +4304,14 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)if (sp->config.intr_type ==MSI_X )tx_intr_handler (fifo); -return 0 ; +return NETDEV_TX_OK ; pci_map_failed: stats->pci_map_fail_cnt++;s2io_stop_tx_queue (sp, fifo->fifo_no); stats->mem_freed += skb->truesize;dev_kfree_skb (skb);spin_unlock_irqrestore (&fifo->tx_lock, flags); -return 0 ; +return NETDEV_TX_OK ; } static void
drivers/net/sb1000.c +1 -1
@@ -1086,7 +1086,7 @@ sb1000_start_xmit(struct sk_buff *skb, struct net_device *dev)printk (KERN_WARNING "%s: trying to transmit!!!\n" , dev->name);/* sb1000 can't xmit datagrams */ dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }/* SB1000 interrupt handler. */
drivers/net/sb1250-mac.c +1 -1
@@ -2091,7 +2091,7 @@ static int sbmac_start_tx(struct sk_buff *skb, struct net_device *dev)spin_unlock_irqrestore (&sc->sbm_lock, flags); -return 0 ; +return NETDEV_TX_OK ; }/**********************************************************************
drivers/net/seeq8005.c +2 -2
@@ -401,7 +401,7 @@ static int seeq8005_send_packet(struct sk_buff *skb, struct net_device *dev)if (length <ETH_ZLEN ) {if (skb_padto (skb,ETH_ZLEN )) -return 0 ; +return NETDEV_TX_OK ; length =ETH_ZLEN ; } buf = skb->data;
@@ -415,7 +415,7 @@ static int seeq8005_send_packet(struct sk_buff *skb, struct net_device *dev)dev_kfree_skb (skb);/* You might need to clean up and record Tx statistics here. */ -return 0 ; +return NETDEV_TX_OK ; }/*
drivers/net/sgiseeq.c +2 -2
@@ -594,7 +594,7 @@ static int sgiseeq_start_xmit(struct sk_buff *skb, struct net_device *dev) len = skb->len;if (len <ETH_ZLEN ) {if (skb_padto (skb,ETH_ZLEN )) -return 0 ; +return NETDEV_TX_OK ; len =ETH_ZLEN ; }
@@ -642,7 +642,7 @@ static int sgiseeq_start_xmit(struct sk_buff *skb, struct net_device *dev)netif_stop_queue (dev);spin_unlock_irqrestore (&sp->tx_lock, flags); -return 0 ; +return NETDEV_TX_OK ; }static void timeout (struct net_device *dev)
drivers/net/sh_eth.c +1 -1
@@ -1140,7 +1140,7 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev) ndev->trans_start = jiffies; -return 0 ; +return NETDEV_TX_OK ; }/* device close function */
drivers/net/sis900.c +1 -1
@@ -1628,7 +1628,7 @@ sis900_start_xmit(struct sk_buff *skb, struct net_device *net_dev)"to slot %d.\n" , net_dev->name, skb->data, (int)skb->len, entry); -return 0 ; +return NETDEV_TX_OK ; }/**
drivers/net/skfp/skfddi.c +1 -1
@@ -1091,7 +1091,7 @@ static int skfp_send_pkt(struct sk_buff *skb, struct net_device *dev)netif_stop_queue (dev); } dev->trans_start = jiffies; -return 0 ; +return NETDEV_TX_OK ; }// skfp_send_pkt
drivers/net/slip.c +3 -3
@@ -484,12 +484,12 @@ sl_xmit(struct sk_buff *skb, struct net_device *dev)spin_unlock (&sl->lock);printk (KERN_WARNING "%s: xmit call when iface is down\n" , dev->name);dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }if (sl->tty ==NULL ) {spin_unlock (&sl->lock);dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }sl_lock (sl);
@@ -498,7 +498,7 @@ sl_xmit(struct sk_buff *skb, struct net_device *dev)spin_unlock (&sl->lock);dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }
drivers/net/smc911x.c +3 -3
@@ -553,7 +553,7 @@ static int smc911x_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) dev->stats.tx_dropped++;spin_unlock_irqrestore (&lp->lock, flags);dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }#ifdef SMC_USE_DMA
@@ -566,7 +566,7 @@ static int smc911x_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) lp->pending_tx_skb = skb;netif_stop_queue (dev);spin_unlock_irqrestore (&lp->lock, flags); -return 0 ; +return NETDEV_TX_OK ; }else {DBG (SMC_DEBUG_TX |SMC_DEBUG_DMA ,"%s: Activating Tx DMA\n" , dev->name); lp->txdma_active =1 ;
@@ -577,7 +577,7 @@ static int smc911x_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)smc911x_hardware_send_pkt (dev);spin_unlock_irqrestore (&lp->lock, flags); -return 0 ; +return NETDEV_TX_OK ; }/*
drivers/net/smc9194.c +4 -4
@@ -512,7 +512,7 @@ static int smc_wait_to_send_packet( struct sk_buff * skb, struct net_device * deif (length <ETH_ZLEN ) {if (skb_padto (skb,ETH_ZLEN )) {netif_wake_queue (dev); -return 0 ; +return NETDEV_TX_OK ; } length =ETH_ZLEN ; }
@@ -534,7 +534,7 @@ static int smc_wait_to_send_packet( struct sk_buff * skb, struct net_device * de lp->saved_skb =NULL ;/* this IS an error, but, i don't want the skb saved */ netif_wake_queue (dev); -return 0 ; +return NETDEV_TX_OK ; }/* either way, a packet is waiting now */ lp->packets_waiting++;
@@ -571,12 +571,12 @@ static int smc_wait_to_send_packet( struct sk_buff * skb, struct net_device * deSMC_ENABLE_INT (IM_ALLOC_INT );PRINTK2 ((CARDNAME ": memory allocation deferred. \n" ));/* it's deferred, but I'll handle it later */ -return 0 ; +return NETDEV_TX_OK ; }/* or YES! I can send the packet now.. */ smc_hardware_send_packet (dev);netif_wake_queue (dev); -return 0 ; +return NETDEV_TX_OK ; }/*
drivers/net/smc91x.c +2 -2
@@ -655,7 +655,7 @@ static int smc_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) dev->stats.tx_errors++; dev->stats.tx_dropped++;dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }smc_special_lock (&lp->lock);
@@ -692,7 +692,7 @@ static int smc_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)smc_hardware_send_pkt ((unsigned long )dev); } -return 0 ; +return NETDEV_TX_OK ; }/*
drivers/net/starfire.c +1 -1
@@ -1311,7 +1311,7 @@ static int start_tx(struct sk_buff *skb, struct net_device *dev) dev->trans_start = jiffies; -return 0 ; +return NETDEV_TX_OK ; }
drivers/net/sun3_82586.c +2 -2
@@ -1015,7 +1015,7 @@ static int sun3_82586_send_packet(struct sk_buff *skb, struct net_device *dev)if (skb->len >XMIT_BUFF_SIZE ) {printk ("%s: Sorry, max. framelength is %d bytes. The length of your frame is %d bytes.\n" ,dev->name,XMIT_BUFF_SIZE ,skb->len); -return 0 ; +return NETDEV_TX_OK ; }netif_stop_queue (dev);
@@ -1110,7 +1110,7 @@ static int sun3_82586_send_packet(struct sk_buff *skb, struct net_device *dev)dev_kfree_skb (skb);#endif } -return 0 ; +return NETDEV_TX_OK ; }/*******************************************
drivers/net/sun3lance.c +2 -2
@@ -562,7 +562,7 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev )netif_start_queue (dev); dev->trans_start = jiffies; -return 0 ; +return NETDEV_TX_OK ; }
@@ -648,7 +648,7 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev )local_irq_restore (flags); -return 0 ; +return NETDEV_TX_OK ; }/* The LANCE interrupt handler. */
drivers/net/sunbmac.c +1 -1
@@ -984,7 +984,7 @@ static int bigmac_start_xmit(struct sk_buff *skb, struct net_device *dev) dev->trans_start = jiffies; -return 0 ; +return NETDEV_TX_OK ; }static struct net_device_stats *bigmac_get_stats (struct net_device *dev)
drivers/net/sundance.c +1 -1
@@ -1091,7 +1091,7 @@ start_tx (struct sk_buff *skb, struct net_device *dev)"%s: Transmit frame #%d queued in slot %d.\n" , dev->name, np->cur_tx, entry); } -return 0 ; +return NETDEV_TX_OK ; }/* Reset hardware tx and free all of tx buffers */
drivers/net/sunhme.c +1 -1
@@ -2338,7 +2338,7 @@ static int happy_meal_start_xmit(struct sk_buff *skb, struct net_device *dev) dev->trans_start = jiffies;tx_add_log (hp,TXLOG_ACTION_TXMIT ,0 ); -return 0 ; +return NETDEV_TX_OK ; }static struct net_device_stats *happy_meal_get_stats (struct net_device *dev)
drivers/net/sunlance.c +1 -1
@@ -1163,7 +1163,7 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev) dev->trans_start = jiffies;dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }/* taken from the depca driver */
drivers/net/sunqe.c +1 -1
@@ -621,7 +621,7 @@ static int qe_start_xmit(struct sk_buff *skb, struct net_device *dev)dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }static void qe_set_multicast (struct net_device *dev)
drivers/net/tc35815.c +1 -1
@@ -1509,7 +1509,7 @@ static int tc35815_send_packet(struct sk_buff *skb, struct net_device *dev)*/ spin_unlock_irqrestore (&lp->lock, flags); -return 0 ; +return NETDEV_TX_OK ; }#define FATAL_ERROR_INT \
drivers/net/tlan.c +3 -3
@@ -1095,11 +1095,11 @@ static int TLan_StartTx( struct sk_buff *skb, struct net_device *dev )TLAN_DBG (TLAN_DEBUG_TX ,"TRANSMIT: %s PHY is not ready\n" , dev->name );dev_kfree_skb_any (skb); -return 0 ; +return NETDEV_TX_OK ; }if (skb_padto (skb,TLAN_MIN_FRAME_SIZE )) -return 0 ; +return NETDEV_TX_OK ; txlen =max (skb->len, (unsigned int )TLAN_MIN_FRAME_SIZE ); tail_list = priv->txList + priv->txTail;
@@ -1150,7 +1150,7 @@ static int TLan_StartTx( struct sk_buff *skb, struct net_device *dev )CIRC_INC ( priv->txTail,TLAN_NUM_TX_LISTS ); dev->trans_start = jiffies; -return 0 ; +return NETDEV_TX_OK ; }/* TLan_StartTx */
drivers/net/tokenring/3c359.c +1 -1
@@ -1240,7 +1240,7 @@ static int xl_xmit(struct sk_buff *skb, struct net_device *dev)spin_unlock_irqrestore (&xl_priv->xl_lock,flags) ; -return 0 ; +return NETDEV_TX_OK ; }else {spin_unlock_irqrestore (&xl_priv->xl_lock,flags) ;return NETDEV_TX_BUSY ;
drivers/net/tokenring/ibmtr.c +1 -1
@@ -1041,7 +1041,7 @@ static int tok_send_packet(struct sk_buff *skb, struct net_device *dev)writeb (CMD_IN_SRB , ti->mmio +ACA_OFFSET +ACA_SET +ISRA_ODD );spin_unlock_irqrestore (&(ti->lock), flags); dev->trans_start = jiffies; -return 0 ; +return NETDEV_TX_OK ; }/*****************************************************************************/
drivers/net/tokenring/lanstreamer.c +1 -1
@@ -1183,7 +1183,7 @@ static int streamer_xmit(struct sk_buff *skb, struct net_device *dev) streamer_priv->tx_ring_free = (streamer_priv->tx_ring_free +1 ) & (STREAMER_TX_RING_SIZE -1 );spin_unlock_irqrestore (&streamer_priv->streamer_lock,flags); -return 0 ; +return NETDEV_TX_OK ; }else {netif_stop_queue (dev);spin_unlock_irqrestore (&streamer_priv->streamer_lock,flags);
drivers/net/tokenring/olympic.c +1 -1
@@ -1052,7 +1052,7 @@ static int olympic_xmit(struct sk_buff *skb, struct net_device *dev)writew ((((readw (olympic_mmio+TXENQ_1 )) &0x8000 ) ^0x8000 ) |1 ,olympic_mmio+TXENQ_1 );netif_wake_queue (dev);spin_unlock_irqrestore (&olympic_priv->olympic_lock,flags); -return 0 ; +return NETDEV_TX_OK ; }else {spin_unlock_irqrestore (&olympic_priv->olympic_lock,flags);return NETDEV_TX_BUSY ;
drivers/net/tulip/de2104x.c +1 -1
@@ -651,7 +651,7 @@ static int de_start_xmit (struct sk_buff *skb, struct net_device *dev)dw32 (TxPoll, NormalTxPoll); dev->trans_start = jiffies; -return 0 ; +return NETDEV_TX_OK ; }/* Set or clear the multicast filter for this adaptor.
drivers/net/tulip/tulip_core.c +1 -1
@@ -690,7 +690,7 @@ tulip_start_xmit(struct sk_buff *skb, struct net_device *dev) dev->trans_start = jiffies; -return 0 ; +return NETDEV_TX_OK ; }static void tulip_clean_tx_ring (struct tulip_private *tp)
drivers/net/tulip/uli526x.c +2 -2
@@ -582,7 +582,7 @@ static int uli526x_start_xmit(struct sk_buff *skb, struct net_device *dev)if (skb->len >MAX_PACKET_SIZE ) { printk(KERN_ERR DRV_NAME ": big packet = %d\n", (u16)skb->len);dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }spin_lock_irqsave (&db->lock, flags);
@@ -624,7 +624,7 @@ static int uli526x_start_xmit(struct sk_buff *skb, struct net_device *dev)/* free this SKB */ dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }
drivers/net/tulip/winbond-840.c +1 -1
@@ -1058,7 +1058,7 @@ static int start_tx(struct sk_buff *skb, struct net_device *dev)printk (KERN_DEBUG "%s: Transmit frame #%d queued in slot %d.\n" , dev->name, np->cur_tx, entry); } -return 0 ; +return NETDEV_TX_OK ; }static void netdev_tx_done (struct net_device *dev)
drivers/net/tulip/xircom_cb.c +1 -1
@@ -434,7 +434,7 @@ static int xircom_start_xmit(struct sk_buff *skb, struct net_device *dev) card->transmit_used = nextdescriptor;leave ("xircom-start_xmit - sent" );spin_unlock_irqrestore (&card->lock,flags); -return 0 ; +return NETDEV_TX_OK ; }
drivers/net/tun.c +2 -2
@@ -398,12 +398,12 @@ static int tun_net_xmit(struct sk_buff *skb, struct net_device *dev)if (tun->flags &TUN_FASYNC )kill_fasync (&tun->fasync,SIGIO ,POLL_IN );wake_up_interruptible (&tun->socket.wait); -return 0 ; +return NETDEV_TX_OK ; drop: dev->stats.tx_dropped++;kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }static void tun_net_mclist (struct net_device *dev)
drivers/net/typhoon.c +1 -1
@@ -909,7 +909,7 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device *dev)netif_wake_queue (dev); } -return 0 ; +return NETDEV_TX_OK ; } static void
drivers/net/ucc_geth.c +1 -1
@@ -3165,7 +3165,7 @@ static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev)#endif spin_unlock_irq (&ugeth->lock); -return 0 ; +return NETDEV_TX_OK ; }static int ucc_geth_rx (struct ucc_geth_private *ugeth,u8 rxQ,int rx_work_limit)
drivers/net/usb/catc.c +1 -1
@@ -448,7 +448,7 @@ static int catc_start_xmit(struct sk_buff *skb, struct net_device *netdev)dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }static void catc_tx_timeout (struct net_device *netdev)
drivers/net/usb/hso.c +1 -1
@@ -780,7 +780,7 @@ static int hso_net_start_xmit(struct sk_buff *skb, struct net_device *net)netif_stop_queue (net);if (hso_get_activity (odev->parent) == -EAGAIN ) { odev->skb_tx_buf = skb; -return 0 ; +return NETDEV_TX_OK ; }/* log if asked */
drivers/net/usb/kaweth.c +2 -2
@@ -829,7 +829,7 @@ static int kaweth_start_xmit(struct sk_buff *skb, struct net_device *net) kaweth->stats.tx_errors++;netif_start_queue (net);spin_unlock_irq (&kaweth->device_lock); -return 0 ; +return NETDEV_TX_OK ; } }
@@ -864,7 +864,7 @@ skip:spin_unlock_irq (&kaweth->device_lock); -return 0 ; +return NETDEV_TX_OK ; }/****************************************************************
drivers/net/usb/pegasus.c +1 -1
@@ -914,7 +914,7 @@ static int pegasus_start_xmit(struct sk_buff *skb, struct net_device *net) }dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }static struct net_device_stats *pegasus_netdev_stats (struct net_device *dev)
drivers/net/usb/rtl8150.c +1 -1
@@ -753,7 +753,7 @@ static int rtl8150_start_xmit(struct sk_buff *skb, struct net_device *netdev) netdev->trans_start = jiffies; } -return 0 ; +return NETDEV_TX_OK ; }
drivers/net/veth.c +3 -3
@@ -189,17 +189,17 @@ static int veth_xmit(struct sk_buff *skb, struct net_device *dev) rcv_stats->rx_packets++;netif_rx (skb); -return 0 ; +return NETDEV_TX_OK ; tx_drop:kfree_skb (skb); stats->tx_dropped++; -return 0 ; +return NETDEV_TX_OK ; rx_drop:kfree_skb (skb); rcv_stats->rx_dropped++; -return 0 ; +return NETDEV_TX_OK ; }/*
drivers/net/via-rhine.c +3 -3
@@ -1225,7 +1225,7 @@ static int rhine_start_tx(struct sk_buff *skb, struct net_device *dev) entry = rp->cur_tx %TX_RING_SIZE ;if (skb_padto (skb,ETH_ZLEN )) -return 0 ; +return NETDEV_TX_OK ; rp->tx_skbuff[entry] = skb;
@@ -1237,7 +1237,7 @@ static int rhine_start_tx(struct sk_buff *skb, struct net_device *dev)dev_kfree_skb (skb); rp->tx_skbuff[entry] =NULL ; dev->stats.tx_dropped++; -return 0 ; +return NETDEV_TX_OK ; }/* Padding is not copied and so must be redone. */
@@ -1285,7 +1285,7 @@ static int rhine_start_tx(struct sk_buff *skb, struct net_device *dev)printk (KERN_DEBUG "%s: Transmit frame #%d queued in slot %d.\n" , dev->name, rp->cur_tx-1 , entry); } -return 0 ; +return NETDEV_TX_OK ; }/* The interrupt handler does all of the Rx thread work and cleans up
drivers/net/via-velocity.c +1 -1
@@ -2098,7 +2098,7 @@ static int velocity_xmit(struct sk_buff *skb, struct net_device *dev)#ifdef VELOCITY_ZERO_COPY_SUPPORT if (skb_shinfo (skb)->nr_frags >6 &&__skb_linearize (skb)) {kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }#endif
drivers/net/vxge/vxge-main.c +2 -2
@@ -1000,7 +1000,7 @@ vxge_xmit(struct sk_buff *skb, struct net_device *dev)VXGE_COMPLETE_VPATH_TX (fifo);vxge_debug_entryexit (VXGE_TRACE ,"%s: %s:%d Exiting..." , dev->name, __func__, __LINE__); -return 0 ; +return NETDEV_TX_OK ; _exit0:vxge_debug_tx (VXGE_TRACE ,"%s: pci_map_page failed" , dev->name);
@@ -1024,7 +1024,7 @@ _exit2:spin_unlock_irqrestore (&fifo->tx_lock, flags);VXGE_COMPLETE_VPATH_TX (fifo); -return 0 ; +return NETDEV_TX_OK ; }/*
drivers/net/wan/cycx_x25.c +1 -1
@@ -663,7 +663,7 @@ static int cycx_netdevice_hard_start_xmit(struct sk_buff *skb, free_packet:dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }/* Get Ethernet-style interface statistics.
drivers/net/wan/hdlc_fr.c +3 -3
@@ -421,7 +421,7 @@ static int pvc_xmit(struct sk_buff *skb, struct net_device *dev) GFP_ATOMIC)) { dev->stats.tx_dropped++;dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }skb_put (skb, pad);memset (skb->data + len,0 , pad);
@@ -435,13 +435,13 @@ static int pvc_xmit(struct sk_buff *skb, struct net_device *dev) dev->stats.tx_compressed++; skb->dev = pvc->frad;dev_queue_xmit (skb); -return 0 ; +return NETDEV_TX_OK ; } } dev->stats.tx_dropped++;dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }static inline void fr_log_dlci_active (pvc_device *pvc)
drivers/net/wan/sbni.c +2 -2
@@ -465,7 +465,7 @@ sbni_start_xmit( struct sk_buff *skb, struct net_device *dev )prepare_to_send ( skb, p );spin_unlock ( &nl->lock );netif_start_queue ( dev ); -return 0 ; +return NETDEV_TX_OK ; } }
@@ -485,7 +485,7 @@ sbni_start_xmit( struct sk_buff *skb, struct net_device *dev )prepare_to_send ( skb, dev );spin_unlock ( &nl->lock ); - return 0; + return NETDEV_TX_OK; }#endif /* CONFIG_SBNI_MULTILINE */
drivers/net/wan/x25_asy.c +5 -5
@@ -308,7 +308,7 @@ static int x25_asy_xmit(struct sk_buff *skb, struct net_device *dev)printk (KERN_ERR "%s: xmit call when iface is down\n" , dev->name);kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }switch (skb->data[0 ]) {
@@ -319,14 +319,14 @@ static int x25_asy_xmit(struct sk_buff *skb, struct net_device *dev)if (err !=LAPB_OK )printk (KERN_ERR "x25_asy: lapb_connect_request error - %d\n" , err);kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ;case 0x02 :/* Disconnect request .. do nothing - hang up ?? */ err =lapb_disconnect_request (dev);if (err !=LAPB_OK )printk (KERN_ERR "x25_asy: lapb_disconnect_request error - %d\n" , err);default :kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }skb_pull (skb,1 );/* Remove control byte */ /*
@@ -344,9 +344,9 @@ static int x25_asy_xmit(struct sk_buff *skb, struct net_device *dev)if (err !=LAPB_OK ) {printk (KERN_ERR "x25_asy: lapb_data_request error - %d\n" , err);kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; } -return 0 ; +return NETDEV_TX_OK ; }
drivers/net/wireless/airo.c +7 -7
@@ -1927,7 +1927,7 @@ static int mpi_start_xmit(struct sk_buff *skb, struct net_device *dev) {if (!skb) {airo_print_err (dev->name,"%s: skb == NULL!" ,__func__); -return 0 ; +return NETDEV_TX_OK ; } npacks =skb_queue_len (&ai->txq);
@@ -1938,7 +1938,7 @@ static int mpi_start_xmit(struct sk_buff *skb, struct net_device *dev) {return NETDEV_TX_BUSY ; }skb_queue_tail (&ai->txq, skb); -return 0 ; +return NETDEV_TX_OK ; }spin_lock_irqsave (&ai->aux_lock, flags);
@@ -1951,7 +1951,7 @@ static int mpi_start_xmit(struct sk_buff *skb, struct net_device *dev) {set_bit (FLAG_PENDING_XMIT , &ai->flags);mpi_send_packet (dev); } -return 0 ; +return NETDEV_TX_OK ; }/*
@@ -2127,7 +2127,7 @@ static int airo_start_xmit(struct sk_buff *skb, struct net_device *dev) {if ( skb ==NULL ) {airo_print_err (dev->name,"%s: skb == NULL!" , __func__); -return 0 ; +return NETDEV_TX_OK ; }/* Find a vacant FID */
@@ -2155,7 +2155,7 @@ static int airo_start_xmit(struct sk_buff *skb, struct net_device *dev) {wake_up_interruptible (&priv->thr_wait); }else airo_end_xmit (dev); -return 0 ; +return NETDEV_TX_OK ; }static void airo_end_xmit11 (struct net_device *dev) {
@@ -2199,7 +2199,7 @@ static int airo_start_xmit11(struct sk_buff *skb, struct net_device *dev) {if ( skb ==NULL ) {airo_print_err (dev->name,"%s: skb == NULL!" , __func__); -return 0 ; +return NETDEV_TX_OK ; }/* Find a vacant FID */
@@ -2227,7 +2227,7 @@ static int airo_start_xmit11(struct sk_buff *skb, struct net_device *dev) {wake_up_interruptible (&priv->thr_wait); }else airo_end_xmit11 (dev); -return 0 ; +return NETDEV_TX_OK ; }static void airo_read_stats (struct net_device *dev)
drivers/net/wireless/arlan-main.c +1 -1
@@ -1193,7 +1193,7 @@ static int arlan_tx(struct sk_buff *skb, struct net_device *dev)arlan_process_interrupt (dev);ARLAN_DEBUG_EXIT ("arlan_tx" ); -return 0 ; +return NETDEV_TX_OK ; bad_end:arlan_process_interrupt (dev);
drivers/net/wireless/atmel.c +3 -3
@@ -793,13 +793,13 @@ static int start_tx(struct sk_buff *skb, struct net_device *dev) !(*priv->present_callback)(priv->card)) { dev->stats.tx_errors++;dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }if (priv->station_state !=STATION_STATE_READY ) { dev->stats.tx_errors++;dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }/* first ensure the timer func cannot run */
@@ -856,7 +856,7 @@ static int start_tx(struct sk_buff *skb, struct net_device *dev)spin_unlock_bh (&priv->timerlock);dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; } static void atmel_transmit_management_frame(struct atmel_private *priv,
drivers/net/wireless/mac80211_hwsim.c +1 -1
@@ -314,7 +314,7 @@ static int hwsim_mon_xmit(struct sk_buff *skb, struct net_device *dev) {/* TODO: allow packet injection */ dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }
drivers/net/wireless/netwave_cs.c +1 -1
@@ -1047,7 +1047,7 @@ static int netwave_start_xmit(struct sk_buff *skb, struct net_device *dev) { }dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }/* netwave_start_xmit */ /*
drivers/net/wireless/ray_cs.c +3 -3
@@ -937,7 +937,7 @@ static int ray_dev_start_xmit(struct sk_buff *skb, struct net_device *dev)if (length <ETH_ZLEN ) {if (skb_padto (skb,ETH_ZLEN )) -return 0 ; +return NETDEV_TX_OK ; length =ETH_ZLEN ; }switch (ray_hw_xmit (skb->data, length, dev,DATA_TYPE )) {
@@ -951,9 +951,9 @@ static int ray_dev_start_xmit(struct sk_buff *skb, struct net_device *dev)default : dev->trans_start = jiffies;dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; } -return 0 ; +return NETDEV_TX_OK ; }/* ray_dev_start_xmit */ /*===========================================================================*/
drivers/net/wireless/strip.c +1 -1
@@ -1582,7 +1582,7 @@ static int strip_xmit(struct sk_buff *skb, struct net_device *dev)if (skb)dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }/*
drivers/net/wireless/zd1201.c +2 -2
@@ -789,7 +789,7 @@ static int zd1201_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)if (!zd->mac_enabled || zd->monitor) { dev->stats.tx_dropped++;kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }netif_stop_queue (dev);
@@ -826,7 +826,7 @@ static int zd1201_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) }kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }static void zd1201_tx_timeout (struct net_device *dev)
drivers/net/xen-netfront.c +2 -2
@@ -558,12 +558,12 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)spin_unlock_irq (&np->tx_lock); -return 0 ; +return NETDEV_TX_OK ; drop: dev->stats.tx_dropped++;dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }static int xennet_close (struct net_device *dev)
drivers/net/yellowfin.c +2 -2
@@ -827,7 +827,7 @@ static int yellowfin_start_xmit(struct sk_buff *skb, struct net_device *dev)if (skb_padto (skb, len)) { yp->tx_skbuff[entry] =NULL ;netif_wake_queue (dev); -return 0 ; +return NETDEV_TX_OK ; } } }
@@ -881,7 +881,7 @@ static int yellowfin_start_xmit(struct sk_buff *skb, struct net_device *dev)printk (KERN_DEBUG "%s: Yellowfin transmit frame #%d queued in slot %d.\n" , dev->name, yp->cur_tx, entry); } -return 0 ; +return NETDEV_TX_OK ; }/* The interrupt handler does all of the Rx thread work and cleans up
drivers/net/znet.c +2 -2
@@ -546,7 +546,7 @@ static int znet_send_packet(struct sk_buff *skb, struct net_device *dev)if (length <ETH_ZLEN ) {if (skb_padto (skb,ETH_ZLEN )) -return 0 ; +return NETDEV_TX_OK ; length =ETH_ZLEN ; }
@@ -600,7 +600,7 @@ static int znet_send_packet(struct sk_buff *skb, struct net_device *dev)printk (KERN_DEBUG "%s: Transmitter queued, length %d.\n" , dev->name, length); }dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }/* The ZNET interrupt handler. */
drivers/s390/net/ctcm_main.c +5 -5
@@ -880,7 +880,7 @@ static int ctcm_tx(struct sk_buff *skb, struct net_device *dev)"%s(%s): NULL sk_buff passed" , CTCM_FUNTAIL, dev->name); priv->stats.tx_dropped++; -return 0 ; +return NETDEV_TX_OK ; }if (skb_headroom (skb) < (LL_HEADER_LENGTH +2 )) { CTCM_DBF_TEXT_(ERROR, CTC_DBF_ERROR,
@@ -888,7 +888,7 @@ static int ctcm_tx(struct sk_buff *skb, struct net_device *dev) CTCM_FUNTAIL, dev->name, LL_HEADER_LENGTH + 2);dev_kfree_skb (skb); priv->stats.tx_dropped++; -return 0 ; +return NETDEV_TX_OK ; }/*
@@ -901,7 +901,7 @@ static int ctcm_tx(struct sk_buff *skb, struct net_device *dev) priv->stats.tx_dropped++; priv->stats.tx_errors++; priv->stats.tx_carrier_errors++; -return 0 ; +return NETDEV_TX_OK ; }if (ctcm_test_and_set_busy (dev))
@@ -910,7 +910,7 @@ static int ctcm_tx(struct sk_buff *skb, struct net_device *dev) dev->trans_start = jiffies;if (ctcm_transmit_skb (priv->channel[WRITE ], skb) !=0 )return NETDEV_TX_BUSY ; -return 0 ; +return NETDEV_TX_OK ; }/* unmerged MPC variant of ctcm_tx */
@@ -1008,7 +1008,7 @@ done:if (do_debug)MPC_DBF_DEV_NAME (TRACE , dev,"exit" ); -return 0 ;/* handle freeing of skb here */ +return NETDEV_TX_OK ;/* handle freeing of skb here */ }
drivers/staging/at76_usb/at76_usb.c +4 -4
@@ -3134,7 +3134,7 @@ static int at76_tx(struct sk_buff *skb, struct net_device *netdev) netdev->name, __func__);/* skip this packet */ dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }if (priv->tx_urb->status == -EINPROGRESS ) {
@@ -3142,14 +3142,14 @@ static int at76_tx(struct sk_buff *skb, struct net_device *netdev) netdev->name, __func__);/* skip this packet */ dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }if (skb->len <ETH_HLEN ) {printk (KERN_ERR "%s: %s: skb too short (%d)\n" , netdev->name, __func__, skb->len);dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }at76_ledtrig_tx_activity ();/* tell ledtrigger we send a packet */
@@ -3173,7 +3173,7 @@ static int at76_tx(struct sk_buff *skb, struct net_device *netdev) skb->data[ETH_HLEN +1 ], skb->data[ETH_HLEN + 2]);dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; } }else {/* add RFC 1042 header in front */
drivers/staging/epl/VirtualEthernetLinux.c +1 -1
@@ -223,7 +223,7 @@ static int VEthXmit(struct sk_buff *pSkb_p, struct net_device *pNetDevice_p) } Exit: -return 0 ; +return NETDEV_TX_OK ; }
drivers/staging/otus/usbdrv.c +4 -4
@@ -659,7 +659,7 @@ int usbdrv_xmit_frame(struct sk_buff *skb, struct net_device *dev)netif_stop_queue (dev); } -return 0 ; +return NETDEV_TX_OK ; }
@@ -796,13 +796,13 @@ int zfLnxVapXmitFrame(struct sk_buff *skb, struct net_device *dev)if (vapId >=ZM_VAP_PORT_NUMBER ) {dev_kfree_skb_irq (skb); -return 0 ; +return NETDEV_TX_OK ; }#if 1 if (vap[vapId].openFlag ==0 ) {dev_kfree_skb_irq (skb); -return 0 ; +return NETDEV_TX_OK ; }#endif
@@ -819,7 +819,7 @@ int zfLnxVapXmitFrame(struct sk_buff *skb, struct net_device *dev)netif_stop_queue (dev); } -return 0 ; +return NETDEV_TX_OK ; }static const struct net_device_ops vap_netdev_ops = {
drivers/staging/slicoss/slicoss.c +1 -1
@@ -845,7 +845,7 @@ static int slic_xmit_start(struct sk_buff *skb, struct net_device *dev) hcmd->paddrh, DONT_FLUSH); } xmit_done: -return 0 ; +return NETDEV_TX_OK ; xmit_fail:slic_xmit_fail (adapter, skb, offloadcmd, skbtype, status); goto xmit_done;
drivers/usb/gadget/f_phonet.c +1 -1
@@ -256,7 +256,7 @@ out:dev_kfree_skb (skb); dev->stats.tx_dropped++; } -return 0 ; +return NETDEV_TX_OK ; }static int pn_net_mtu (struct net_device *dev,int new_mtu)
drivers/usb/gadget/u_ether.c +3 -3
@@ -487,7 +487,7 @@ static int eth_start_xmit(struct sk_buff *skb, struct net_device *net)if (!in) {dev_kfree_skb_any (skb); -return 0 ; +return NETDEV_TX_OK ; }/* apply outgoing CDC or RNDIS filters */
@@ -506,7 +506,7 @@ static int eth_start_xmit(struct sk_buff *skb, struct net_device *net) type =USB_CDC_PACKET_TYPE_ALL_MULTICAST ;if (!(cdc_filter & type)) {dev_kfree_skb_any (skb); -return 0 ; +return NETDEV_TX_OK ; } }/* ignores USB_CDC_PACKET_TYPE_DIRECTED */
@@ -586,7 +586,7 @@ drop:list_add (&req->list, &dev->tx_reqs);spin_unlock_irqrestore (&dev->req_lock, flags); } -return 0 ; +return NETDEV_TX_OK ; }/*-------------------------------------------------------------------------*/
net/atm/br2684.c +2 -2
@@ -238,7 +238,7 @@ static int br2684_start_xmit(struct sk_buff *skb, struct net_device *dev)/* netif_stop_queue(dev); */ dev_kfree_skb (skb);read_unlock (&devs_lock); -return 0 ; +return NETDEV_TX_OK ; }if (!br2684_xmit_vcc (skb, dev, brvcc)) {/*
@@ -252,7 +252,7 @@ static int br2684_start_xmit(struct sk_buff *skb, struct net_device *dev) dev->stats.tx_fifo_errors++; }read_unlock (&devs_lock); -return 0 ; +return NETDEV_TX_OK ; }/*
net/atm/clip.c +6 -6
@@ -373,7 +373,7 @@ static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev)printk (KERN_ERR "clip_start_xmit: skb_dst(skb) == NULL\n" );dev_kfree_skb (skb); dev->stats.tx_dropped++; -return 0 ; +return NETDEV_TX_OK ; }if (!skb_dst (skb)->neighbour) {#if 0
@@ -387,7 +387,7 @@ static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev)printk (KERN_ERR "clip_start_xmit: NO NEIGHBOUR !\n" );dev_kfree_skb (skb); dev->stats.tx_dropped++; -return 0 ; +return NETDEV_TX_OK ; } entry =NEIGH2ENTRY (skb_dst (skb)->neighbour);if (!entry->vccs) {
@@ -402,7 +402,7 @@ static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev)dev_kfree_skb (skb); dev->stats.tx_dropped++; } -return 0 ; +return NETDEV_TX_OK ; }pr_debug ("neigh %p, vccs %p\n" , entry, entry->vccs);ATM_SKB (skb)->vcc = vcc = entry->vccs->vcc;
@@ -421,14 +421,14 @@ static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev) old =xchg (&entry->vccs->xoff,1 );/* assume XOFF ... */ if (old) {printk (KERN_WARNING "clip_start_xmit: XOFF->XOFF transition\n" ); -return 0 ; +return NETDEV_TX_OK ; } dev->stats.tx_packets++; dev->stats.tx_bytes += skb->len; vcc->send (vcc, skb);if (atm_may_send (vcc,0 )) { entry->vccs->xoff =0 ; -return 0 ; +return NETDEV_TX_OK ; }spin_lock_irqsave (&clip_priv->xoff_lock, flags);netif_stop_queue (dev);/* XOFF -> throttle immediately */
@@ -440,7 +440,7 @@ static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev)of the brief netif_stop_queue. If this isn't true or if it changes, use netif_wake_queue instead. */ spin_unlock_irqrestore (&clip_priv->xoff_lock, flags); -return 0 ; +return NETDEV_TX_OK ; }static int clip_mkip (struct atm_vcc *vcc,int timeout)
net/atm/lec.c +4 -4
@@ -289,7 +289,7 @@ static int lec_start_xmit(struct sk_buff *skb, struct net_device *dev) skb2 =skb_realloc_headroom (skb,LEC_HEADER_LEN );kfree_skb (skb);if (skb2 ==NULL ) -return 0 ; +return NETDEV_TX_OK ; skb = skb2; }skb_push (skb,2 );
@@ -307,7 +307,7 @@ static int lec_start_xmit(struct sk_buff *skb, struct net_device *dev) skb2 =skb_realloc_headroom (skb,LEC_HEADER_LEN );kfree_skb (skb);if (skb2 ==NULL ) -return 0 ; +return NETDEV_TX_OK ; skb = skb2; }#endif
@@ -345,7 +345,7 @@ static int lec_start_xmit(struct sk_buff *skb, struct net_device *dev)dev_kfree_skb (skb);if (skb2 ==NULL ) { dev->stats.tx_dropped++; -return 0 ; +return NETDEV_TX_OK ; } skb = skb2; }
@@ -416,7 +416,7 @@ out:if (entry)lec_arp_put (entry); dev->trans_start = jiffies; -return 0 ; +return NETDEV_TX_OK ; }/* The inverse routine to net_open(). */
net/bluetooth/bnep/netdev.c +3 -3
@@ -175,14 +175,14 @@ static int bnep_net_xmit(struct sk_buff *skb, struct net_device *dev)#ifdef CONFIG_BT_BNEP_MC_FILTER if (bnep_net_mc_filter (skb, s)) {kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }#endif #ifdef CONFIG_BT_BNEP_PROTO_FILTER if (bnep_net_proto_filter (skb, s)) {kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }#endif
@@ -203,7 +203,7 @@ static int bnep_net_xmit(struct sk_buff *skb, struct net_device *dev)netif_stop_queue (dev); } -return 0 ; +return NETDEV_TX_OK ; }static const struct net_device_ops bnep_netdev_ops = {
net/bridge/br_device.c +1 -1
@@ -39,7 +39,7 @@ int br_dev_xmit(struct sk_buff *skb, struct net_device *dev)else br_flood_deliver (br, skb); -return 0 ; +return NETDEV_TX_OK ; }static int br_dev_open (struct net_device *dev)
net/ipv4/ip_gre.c +3 -3
@@ -821,7 +821,7 @@ static int ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) stats->tx_dropped++;dev_kfree_skb (skb); tunnel->recursion--; -return 0 ; +return NETDEV_TX_OK ; }if (skb->sk)skb_set_owner_w (new_skb, skb->sk);
@@ -889,7 +889,7 @@ static int ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)IPTUNNEL_XMIT (); tunnel->recursion--; -return 0 ; +return NETDEV_TX_OK ; tx_error_icmp:dst_link_failure (skb);
@@ -898,7 +898,7 @@ tx_error: stats->tx_errors++;dev_kfree_skb (skb); tunnel->recursion--; -return 0 ; +return NETDEV_TX_OK ; }static int ipgre_tunnel_bind_dev (struct net_device *dev)
net/ipv4/ipip.c +3 -3
@@ -486,7 +486,7 @@ static int ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) stats->tx_dropped++;dev_kfree_skb (skb); tunnel->recursion--; -return 0 ; +return NETDEV_TX_OK ; }if (skb->sk)skb_set_owner_w (new_skb, skb->sk);
@@ -524,7 +524,7 @@ static int ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)IPTUNNEL_XMIT (); tunnel->recursion--; -return 0 ; +return NETDEV_TX_OK ; tx_error_icmp:dst_link_failure (skb);
@@ -532,7 +532,7 @@ tx_error: stats->tx_errors++;dev_kfree_skb (skb); tunnel->recursion--; -return 0 ; +return NETDEV_TX_OK ; }static void ipip_tunnel_bind_dev (struct net_device *dev)
net/ipv4/ipmr.c +1 -1
@@ -212,7 +212,7 @@ static int reg_vif_xmit(struct sk_buff *skb, struct net_device *dev) IGMPMSG_WHOLEPKT);read_unlock (&mrt_lock);kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }static const struct net_device_ops reg_vif_netdev_ops = {
net/ipv6/ip6_tunnel.c +2 -2
@@ -1063,14 +1063,14 @@ ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev) goto tx_err; t->recursion--; -return 0 ; +return NETDEV_TX_OK ; tx_err: stats->tx_errors++; stats->tx_dropped++;kfree_skb (skb); t->recursion--; -return 0 ; +return NETDEV_TX_OK ; }static void ip6_tnl_set_cap (struct ip6_tnl *t)
net/ipv6/ip6mr.c +1 -1
@@ -427,7 +427,7 @@ static int reg_vif_xmit(struct sk_buff *skb, struct net_device *dev) MRT6MSG_WHOLEPKT);read_unlock (&mrt_lock);kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }static const struct net_device_ops reg_vif_netdev_ops = {
net/ipv6/sit.c +3 -3
@@ -753,7 +753,7 @@ static int ipip6_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) stats->tx_dropped++;dev_kfree_skb (skb); tunnel->recursion--; -return 0 ; +return NETDEV_TX_OK ; }if (skb->sk)skb_set_owner_w (new_skb, skb->sk);
@@ -794,7 +794,7 @@ static int ipip6_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)IPTUNNEL_XMIT (); tunnel->recursion--; -return 0 ; +return NETDEV_TX_OK ; tx_error_icmp:dst_link_failure (skb);
@@ -802,7 +802,7 @@ tx_error: stats->tx_errors++;dev_kfree_skb (skb); tunnel->recursion--; -return 0 ; +return NETDEV_TX_OK ; }static void ipip6_tunnel_bind_dev (struct net_device *dev)
net/irda/irlan/irlan_eth.c +2 -2
@@ -177,7 +177,7 @@ static int irlan_eth_xmit(struct sk_buff *skb, struct net_device *dev)/* Did the realloc succeed? */ if (new_skb ==NULL ) -return 0 ; +return NETDEV_TX_OK ;/* Use the new skb instead */ skb = new_skb;
@@ -209,7 +209,7 @@ static int irlan_eth_xmit(struct sk_buff *skb, struct net_device *dev) self->stats.tx_bytes += skb->len; } -return 0 ; +return NETDEV_TX_OK ; }/*
net/netrom/nr_dev.c +2 -2
@@ -177,13 +177,13 @@ static int nr_xmit(struct sk_buff *skb, struct net_device *dev)if (!nr_route_frame (skb,NULL )) {kfree_skb (skb); stats->tx_errors++; -return 0 ; +return NETDEV_TX_OK ; } stats->tx_packets++; stats->tx_bytes += len; -return 0 ; +return NETDEV_TX_OK ; }static const struct header_ops nr_header_ops = {
net/phonet/pep-gprs.c +2 -2
@@ -195,7 +195,7 @@ static int gprs_xmit(struct sk_buff *skb, struct net_device *dev)break ;default :dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }skb_orphan (skb);
@@ -215,7 +215,7 @@ static int gprs_xmit(struct sk_buff *skb, struct net_device *dev)netif_stop_queue (dev);if (pep_writeable (sk))netif_wake_queue (dev); -return 0 ; +return NETDEV_TX_OK ; }static int gprs_set_mtu (struct net_device *dev,int new_mtu)
net/rose/rose_dev.c +1 -1
@@ -141,7 +141,7 @@ static int rose_xmit(struct sk_buff *skb, struct net_device *dev) }dev_kfree_skb (skb); stats->tx_errors++; -return 0 ; +return NETDEV_TX_OK ; }static const struct header_ops rose_header_ops = {
net/sched/sch_teql.c +3 -3
@@ -314,7 +314,7 @@ restart:netif_wake_queue (dev); txq->tx_packets++; txq->tx_bytes += length; -return 0 ; +return NETDEV_TX_OK ; }__netif_tx_unlock (slave_txq); }
@@ -323,7 +323,7 @@ restart:break ;case 1 : master->slaves =NEXT_SLAVE (q); -return 0 ; +return NETDEV_TX_OK ;default : nores =1 ;break ;
@@ -345,7 +345,7 @@ restart: drop: txq->tx_dropped++;dev_kfree_skb (skb); -return 0 ; +return NETDEV_TX_OK ; }static int teql_master_open (struct net_device *dev)
Quoted 2 lines · Patrick McHardy
This patch is the result of an automatic spatch transformation to convert all
ndo_start_xmit()return values of 0 toNETDEV_TX_OK.
It might be useful if you submitted the spatch source that created this transformation.
Quoted 6 lines · Joe Perches
Quoted 2 lines · Patrick McHardy
This patch is the result of an automatic spatch transformation to convert all
ndo_start_xmit()return values of 0 toNETDEV_TX_OK.It might be useful if you submitted the spatch source that created this transformation.
I would have added it to the changelog, but it includes some workarounds for false-negatives since the version used in Debian seems to be buggy. Namely, it didn't manage to find occurences if there was only one, so I included a number of NOP transformations to work around that. Or maybe I'm doing something wrong :)
Attached for reference.
@ ndomatch @
identifier ndo, xmit;
@@
struct net_device_ops ndo = {
.ndo_start_xmit = xmit,
};@forall@
identifier skb, dev;
identifier ndomatch.xmit;
@@
int xmit(struct sk_buff *skb, struct net_device *dev) {
...
(
- return 1;
+ return NETDEV_TX_BUSY;
|
- return -1;
+ return NETDEV_TX_LOCKED;
|
- return 0;
+ return NETDEV_TX_OK;
|
- return NETDEV_TX_BUSY;
+ return NETDEV_TX_BUSY;
|
- return NETDEV_TX_LOCKED;
+ return NETDEV_TX_LOCKED;
|
- return NETDEV_TX_OK;
+ return NETDEV_TX_OK;
)
...
}
David Miller
maintainerFrom: Patrick McHardy <[email protected]>
Date: Tue, 23 Jun 2009 18:03:08 +0200
Quoted 9 lines
net: use
NETDEV_TX_OKinstead of 0 inndo_start_xmit()functionsThis patch is the result of an automatic spatch transformation to convert all
ndo_start_xmit()return values of 0 toNETDEV_TX_OK.Some occurences are missed by the automatic conversion, those will be handled in a seperate patch.
Signed-off-by Patrick McHardy <[email protected]>
These patches are cleanups and getting large, especially for this late in the merge window.
I'm going to defer them to the next -next cycle.
Thanks!
From: Patrick McHardy <[email protected]>
Date: Tue, 23 Jun 2009 18:03:08 +0200
Quoted 9 lines
net: use
NETDEV_TX_OKinstead of 0 inndo_start_xmit()functionsThis patch is the result of an automatic spatch transformation to convert all
ndo_start_xmit()return values of 0 toNETDEV_TX_OK.Some occurences are missed by the automatic conversion, those will be handled in a seperate patch.
Signed-off-by Patrick McHardy <[email protected]>
Applied.