net: convert remaining non-symbolic return values in ndo_start_xmit() functions
This patch converts the remaining occurences of raw return values to their symbolic counterparts in ndo_start_xmit() functions that were missed by the previous automatic conversion. Additionally code that assumed the symbolic value of NETDEV_TX_OK to be zero is changed to explicitly use NETDEV_TX_OK. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Этот коммит содержится в:

коммит произвёл
David S. Miller

родитель
a73e76e23c
Коммит
ec634fe328
@@ -1223,7 +1223,7 @@ isdn_ppp_xmit(struct sk_buff *skb, struct net_device *netdev)
|
||||
isdn_net_dev *nd;
|
||||
unsigned int proto = PPP_IP; /* 0x21 */
|
||||
struct ippp_struct *ipt,*ipts;
|
||||
int slot, retval = 0;
|
||||
int slot, retval = NETDEV_TX_OK;
|
||||
|
||||
mlp = (isdn_net_local *) netdev_priv(netdev);
|
||||
nd = mlp->netdev; /* get master lp */
|
||||
@@ -1240,7 +1240,7 @@ isdn_ppp_xmit(struct sk_buff *skb, struct net_device *netdev)
|
||||
if (!(ipts->pppcfg & SC_ENABLE_IP)) { /* PPP connected ? */
|
||||
if (ipts->debug & 0x1)
|
||||
printk(KERN_INFO "%s: IP frame delayed.\n", netdev->name);
|
||||
retval = 1;
|
||||
retval = NETDEV_TX_BUSY;
|
||||
goto out;
|
||||
}
|
||||
|
||||
@@ -1261,7 +1261,7 @@ isdn_ppp_xmit(struct sk_buff *skb, struct net_device *netdev)
|
||||
lp = isdn_net_get_locked_lp(nd);
|
||||
if (!lp) {
|
||||
printk(KERN_WARNING "%s: all channels busy - requeuing!\n", netdev->name);
|
||||
retval = 1;
|
||||
retval = NETDEV_TX_BUSY;
|
||||
goto out;
|
||||
}
|
||||
/* we have our lp locked from now on */
|
||||
|
Ссылка в новой задаче
Block a user