forked from Minki/linux
isdn: convert to netdev_tx_t
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
36e4d64a82
commit
8b62ff2dbc
@ -119,7 +119,7 @@ net_close(struct net_device *dev)
|
||||
/* send a packet on this interface. */
|
||||
/* new style for kernel >= 2.3.33 */
|
||||
/************************************/
|
||||
static int
|
||||
static netdev_tx_t
|
||||
net_send_packet(struct sk_buff *skb, struct net_device *dev)
|
||||
{
|
||||
struct net_local *lp = (struct net_local *) dev;
|
||||
|
@ -176,7 +176,8 @@ static __inline__ void isdn_net_zero_frame_cnt(isdn_net_local *lp)
|
||||
/* Prototypes */
|
||||
|
||||
static int isdn_net_force_dial_lp(isdn_net_local *);
|
||||
static int isdn_net_start_xmit(struct sk_buff *, struct net_device *);
|
||||
static netdev_tx_t isdn_net_start_xmit(struct sk_buff *,
|
||||
struct net_device *);
|
||||
|
||||
static void isdn_net_ciscohdlck_connected(isdn_net_local *lp);
|
||||
static void isdn_net_ciscohdlck_disconnected(isdn_net_local *lp);
|
||||
@ -1160,7 +1161,7 @@ static void isdn_net_tx_timeout(struct net_device * ndev)
|
||||
* If this interface isn't connected to a ISDN-Channel, find a free channel,
|
||||
* and start dialing.
|
||||
*/
|
||||
static int
|
||||
static netdev_tx_t
|
||||
isdn_net_start_xmit(struct sk_buff *skb, struct net_device *ndev)
|
||||
{
|
||||
isdn_net_local *lp = (isdn_net_local *) netdev_priv(ndev);
|
||||
|
Loading…
Reference in New Issue
Block a user