aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/i4l
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/isdn/i4l')
-rw-r--r--drivers/isdn/i4l/isdn_net.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
index de4aad076ebc..8209ed6c6d29 100644
--- a/drivers/isdn/i4l/isdn_net.c
+++ b/drivers/isdn/i4l/isdn_net.c
@@ -1202,7 +1202,7 @@ isdn_net_start_xmit(struct sk_buff *skb, struct net_device *ndev)
1202 if (!(ISDN_NET_DIALMODE(*lp) == ISDN_NET_DM_AUTO)) { 1202 if (!(ISDN_NET_DIALMODE(*lp) == ISDN_NET_DM_AUTO)) {
1203 isdn_net_unreachable(ndev, skb, "dial rejected: interface not in dialmode `auto'"); 1203 isdn_net_unreachable(ndev, skb, "dial rejected: interface not in dialmode `auto'");
1204 dev_kfree_skb(skb); 1204 dev_kfree_skb(skb);
1205 return 0; 1205 return NETDEV_TX_OK;
1206 } 1206 }
1207 if (lp->phone[1]) { 1207 if (lp->phone[1]) {
1208 ulong flags; 1208 ulong flags;
@@ -1215,7 +1215,7 @@ isdn_net_start_xmit(struct sk_buff *skb, struct net_device *ndev)
1215 if(time_before(jiffies, lp->dialwait_timer)) { 1215 if(time_before(jiffies, lp->dialwait_timer)) {
1216 isdn_net_unreachable(ndev, skb, "dial rejected: retry-time not reached"); 1216 isdn_net_unreachable(ndev, skb, "dial rejected: retry-time not reached");
1217 dev_kfree_skb(skb); 1217 dev_kfree_skb(skb);
1218 return 0; 1218 return NETDEV_TX_OK;
1219 } else 1219 } else
1220 lp->dialwait_timer = 0; 1220 lp->dialwait_timer = 0;
1221 } 1221 }
@@ -1243,7 +1243,7 @@ isdn_net_start_xmit(struct sk_buff *skb, struct net_device *ndev)
1243 isdn_net_unreachable(ndev, skb, 1243 isdn_net_unreachable(ndev, skb,
1244 "No channel"); 1244 "No channel");
1245 dev_kfree_skb(skb); 1245 dev_kfree_skb(skb);
1246 return 0; 1246 return NETDEV_TX_OK;
1247 } 1247 }
1248 /* Log packet, which triggered dialing */ 1248 /* Log packet, which triggered dialing */
1249 if (dev->net_verbose) 1249 if (dev->net_verbose)
@@ -1258,7 +1258,7 @@ isdn_net_start_xmit(struct sk_buff *skb, struct net_device *ndev)
1258 dev_kfree_skb(skb); 1258 dev_kfree_skb(skb);
1259 isdn_net_unbind_channel(lp); 1259 isdn_net_unbind_channel(lp);
1260 spin_unlock_irqrestore(&dev->lock, flags); 1260 spin_unlock_irqrestore(&dev->lock, flags);
1261 return 0; /* STN (skb to nirvana) ;) */ 1261 return NETDEV_TX_OK; /* STN (skb to nirvana) ;) */
1262 } 1262 }
1263#ifdef CONFIG_IPPP_FILTER 1263#ifdef CONFIG_IPPP_FILTER
1264 if (isdn_ppp_autodial_filter(skb, lp)) { 1264 if (isdn_ppp_autodial_filter(skb, lp)) {
@@ -1267,7 +1267,7 @@ isdn_net_start_xmit(struct sk_buff *skb, struct net_device *ndev)
1267 spin_unlock_irqrestore(&dev->lock, flags); 1267 spin_unlock_irqrestore(&dev->lock, flags);
1268 isdn_net_unreachable(ndev, skb, "dial rejected: packet filtered"); 1268 isdn_net_unreachable(ndev, skb, "dial rejected: packet filtered");
1269 dev_kfree_skb(skb); 1269 dev_kfree_skb(skb);
1270 return 0; 1270 return NETDEV_TX_OK;
1271 } 1271 }
1272#endif 1272#endif
1273 spin_unlock_irqrestore(&dev->lock, flags); 1273 spin_unlock_irqrestore(&dev->lock, flags);
@@ -1285,7 +1285,7 @@ isdn_net_start_xmit(struct sk_buff *skb, struct net_device *ndev)
1285 isdn_net_unreachable(ndev, skb, 1285 isdn_net_unreachable(ndev, skb,
1286 "No phone number"); 1286 "No phone number");
1287 dev_kfree_skb(skb); 1287 dev_kfree_skb(skb);
1288 return 0; 1288 return NETDEV_TX_OK;
1289 } 1289 }
1290 } else { 1290 } else {
1291 /* Device is connected to an ISDN channel */ 1291 /* Device is connected to an ISDN channel */