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 <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
0e8635a8e1
commit
6ed106549d
@@ -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 */
|
||||
|
Reference in New Issue
Block a user