diff options
author | Patrick McHardy <kaber@trash.net> | 2009-07-05 22:23:38 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-07-05 22:23:38 -0400 |
commit | ec634fe328182a1a098585bfc7b69e5042bdb08d (patch) | |
tree | 02883aaee743af10d78d6d8fe9181944b4dd4529 /drivers/isdn/i4l/isdn_ppp.c | |
parent | a73e76e23c20c05cb8c0b7ba8bc9daa04b05c80f (diff) |
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>
Diffstat (limited to 'drivers/isdn/i4l/isdn_ppp.c')
-rw-r--r-- | drivers/isdn/i4l/isdn_ppp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c index aa30b5cb3513..2d14b64202a3 100644 --- a/drivers/isdn/i4l/isdn_ppp.c +++ b/drivers/isdn/i4l/isdn_ppp.c | |||
@@ -1223,7 +1223,7 @@ isdn_ppp_xmit(struct sk_buff *skb, struct net_device *netdev) | |||
1223 | isdn_net_dev *nd; | 1223 | isdn_net_dev *nd; |
1224 | unsigned int proto = PPP_IP; /* 0x21 */ | 1224 | unsigned int proto = PPP_IP; /* 0x21 */ |
1225 | struct ippp_struct *ipt,*ipts; | 1225 | struct ippp_struct *ipt,*ipts; |
1226 | int slot, retval = 0; | 1226 | int slot, retval = NETDEV_TX_OK; |
1227 | 1227 | ||
1228 | mlp = (isdn_net_local *) netdev_priv(netdev); | 1228 | mlp = (isdn_net_local *) netdev_priv(netdev); |
1229 | nd = mlp->netdev; /* get master lp */ | 1229 | nd = mlp->netdev; /* get master lp */ |
@@ -1240,7 +1240,7 @@ isdn_ppp_xmit(struct sk_buff *skb, struct net_device *netdev) | |||
1240 | if (!(ipts->pppcfg & SC_ENABLE_IP)) { /* PPP connected ? */ | 1240 | if (!(ipts->pppcfg & SC_ENABLE_IP)) { /* PPP connected ? */ |
1241 | if (ipts->debug & 0x1) | 1241 | if (ipts->debug & 0x1) |
1242 | printk(KERN_INFO "%s: IP frame delayed.\n", netdev->name); | 1242 | printk(KERN_INFO "%s: IP frame delayed.\n", netdev->name); |
1243 | retval = 1; | 1243 | retval = NETDEV_TX_BUSY; |
1244 | goto out; | 1244 | goto out; |
1245 | } | 1245 | } |
1246 | 1246 | ||
@@ -1261,7 +1261,7 @@ isdn_ppp_xmit(struct sk_buff *skb, struct net_device *netdev) | |||
1261 | lp = isdn_net_get_locked_lp(nd); | 1261 | lp = isdn_net_get_locked_lp(nd); |
1262 | if (!lp) { | 1262 | if (!lp) { |
1263 | printk(KERN_WARNING "%s: all channels busy - requeuing!\n", netdev->name); | 1263 | printk(KERN_WARNING "%s: all channels busy - requeuing!\n", netdev->name); |
1264 | retval = 1; | 1264 | retval = NETDEV_TX_BUSY; |
1265 | goto out; | 1265 | goto out; |
1266 | } | 1266 | } |
1267 | /* we have our lp locked from now on */ | 1267 | /* we have our lp locked from now on */ |