aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/i4l/isdn_net.c
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-08-31 15:50:44 -0400
committerDavid S. Miller <davem@davemloft.net>2009-09-01 04:13:16 -0400
commit8b62ff2dbc3d6c13997b9d440dfd0ed00e6df96d (patch)
treecc0a8f7037f3244228befdb057ee6b18c8c98963 /drivers/isdn/i4l/isdn_net.c
parent36e4d64a82d9a91a73a2b9b32117aedfe2211fb3 (diff)
isdn: convert to netdev_tx_t
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn/i4l/isdn_net.c')
-rw-r--r--drivers/isdn/i4l/isdn_net.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
index 57bf4bf5027..90b56ed8651 100644
--- a/drivers/isdn/i4l/isdn_net.c
+++ b/drivers/isdn/i4l/isdn_net.c
@@ -176,7 +176,8 @@ static __inline__ void isdn_net_zero_frame_cnt(isdn_net_local *lp)
176/* Prototypes */ 176/* Prototypes */
177 177
178static int isdn_net_force_dial_lp(isdn_net_local *); 178static int isdn_net_force_dial_lp(isdn_net_local *);
179static int isdn_net_start_xmit(struct sk_buff *, struct net_device *); 179static netdev_tx_t isdn_net_start_xmit(struct sk_buff *,
180 struct net_device *);
180 181
181static void isdn_net_ciscohdlck_connected(isdn_net_local *lp); 182static void isdn_net_ciscohdlck_connected(isdn_net_local *lp);
182static void isdn_net_ciscohdlck_disconnected(isdn_net_local *lp); 183static void isdn_net_ciscohdlck_disconnected(isdn_net_local *lp);
@@ -1160,7 +1161,7 @@ static void isdn_net_tx_timeout(struct net_device * ndev)
1160 * If this interface isn't connected to a ISDN-Channel, find a free channel, 1161 * If this interface isn't connected to a ISDN-Channel, find a free channel,
1161 * and start dialing. 1162 * and start dialing.
1162 */ 1163 */
1163static int 1164static netdev_tx_t
1164isdn_net_start_xmit(struct sk_buff *skb, struct net_device *ndev) 1165isdn_net_start_xmit(struct sk_buff *skb, struct net_device *ndev)
1165{ 1166{
1166 isdn_net_local *lp = (isdn_net_local *) netdev_priv(ndev); 1167 isdn_net_local *lp = (isdn_net_local *) netdev_priv(ndev);