Commit 6ed10654 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

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: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0e8635a8

arch/ia64/hp/sim/simeth.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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};

CRA Git | Maintained and supported by SUSTech CRA and CCSE