diff options
Diffstat (limited to 'drivers/isdn/i4l')
-rw-r--r-- | drivers/isdn/i4l/isdn_net.c | 4 | ||||
-rw-r--r-- | drivers/isdn/i4l/isdn_ppp.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c index 8209ed6c6d29..57bf4bf50278 100644 --- a/drivers/isdn/i4l/isdn_net.c +++ b/drivers/isdn/i4l/isdn_net.c | |||
@@ -1051,12 +1051,12 @@ isdn_net_xmit(struct net_device *ndev, struct sk_buff *skb) | |||
1051 | isdn_net_dev *nd; | 1051 | isdn_net_dev *nd; |
1052 | isdn_net_local *slp; | 1052 | isdn_net_local *slp; |
1053 | isdn_net_local *lp = (isdn_net_local *) netdev_priv(ndev); | 1053 | isdn_net_local *lp = (isdn_net_local *) netdev_priv(ndev); |
1054 | int retv = 0; | 1054 | int retv = NETDEV_TX_OK; |
1055 | 1055 | ||
1056 | if (((isdn_net_local *) netdev_priv(ndev))->master) { | 1056 | if (((isdn_net_local *) netdev_priv(ndev))->master) { |
1057 | printk("isdn BUG at %s:%d!\n", __FILE__, __LINE__); | 1057 | printk("isdn BUG at %s:%d!\n", __FILE__, __LINE__); |
1058 | dev_kfree_skb(skb); | 1058 | dev_kfree_skb(skb); |
1059 | return 0; | 1059 | return NETDEV_TX_OK; |
1060 | } | 1060 | } |
1061 | 1061 | ||
1062 | /* For the other encaps the header has already been built */ | 1062 | /* For the other encaps the header has already been built */ |
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 */ |