diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 15:50:44 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-01 04:13:16 -0400 |
commit | 8b62ff2dbc3d6c13997b9d440dfd0ed00e6df96d (patch) | |
tree | cc0a8f7037f3244228befdb057ee6b18c8c98963 /drivers/isdn | |
parent | 36e4d64a82d9a91a73a2b9b32117aedfe2211fb3 (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')
-rw-r--r-- | drivers/isdn/hysdn/hysdn_net.c | 2 | ||||
-rw-r--r-- | drivers/isdn/i4l/isdn_net.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/isdn/hysdn/hysdn_net.c b/drivers/isdn/hysdn/hysdn_net.c index c73004b3b2ac..72eb92647c1b 100644 --- a/drivers/isdn/hysdn/hysdn_net.c +++ b/drivers/isdn/hysdn/hysdn_net.c | |||
@@ -119,7 +119,7 @@ net_close(struct net_device *dev) | |||
119 | /* send a packet on this interface. */ | 119 | /* send a packet on this interface. */ |
120 | /* new style for kernel >= 2.3.33 */ | 120 | /* new style for kernel >= 2.3.33 */ |
121 | /************************************/ | 121 | /************************************/ |
122 | static int | 122 | static netdev_tx_t |
123 | net_send_packet(struct sk_buff *skb, struct net_device *dev) | 123 | net_send_packet(struct sk_buff *skb, struct net_device *dev) |
124 | { | 124 | { |
125 | struct net_local *lp = (struct net_local *) dev; | 125 | struct net_local *lp = (struct net_local *) dev; |
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c index 57bf4bf50278..90b56ed8651f 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 | ||
178 | static int isdn_net_force_dial_lp(isdn_net_local *); | 178 | static int isdn_net_force_dial_lp(isdn_net_local *); |
179 | static int isdn_net_start_xmit(struct sk_buff *, struct net_device *); | 179 | static netdev_tx_t isdn_net_start_xmit(struct sk_buff *, |
180 | struct net_device *); | ||
180 | 181 | ||
181 | static void isdn_net_ciscohdlck_connected(isdn_net_local *lp); | 182 | static void isdn_net_ciscohdlck_connected(isdn_net_local *lp); |
182 | static void isdn_net_ciscohdlck_disconnected(isdn_net_local *lp); | 183 | static 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 | */ |
1163 | static int | 1164 | static netdev_tx_t |
1164 | isdn_net_start_xmit(struct sk_buff *skb, struct net_device *ndev) | 1165 | isdn_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); |