convert ATM drivers 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
6fef4c0c8e
commit
3c805a22a3
|
@ -223,7 +223,8 @@ static inline struct br2684_vcc *pick_outgoing_vcc(const struct sk_buff *skb,
|
|||
return list_empty(&brdev->brvccs) ? NULL : list_entry_brvcc(brdev->brvccs.next); /* 1 vcc/dev right now */
|
||||
}
|
||||
|
||||
static int br2684_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
static netdev_tx_t br2684_start_xmit(struct sk_buff *skb,
|
||||
struct net_device *dev)
|
||||
{
|
||||
struct br2684_dev *brdev = BRPRIV(dev);
|
||||
struct br2684_vcc *brvcc;
|
||||
|
|
|
@ -360,7 +360,8 @@ static int clip_encap(struct atm_vcc *vcc, int mode)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
static netdev_tx_t clip_start_xmit(struct sk_buff *skb,
|
||||
struct net_device *dev)
|
||||
{
|
||||
struct clip_priv *clip_priv = PRIV(dev);
|
||||
struct atmarp_entry *entry;
|
||||
|
|
|
@ -59,7 +59,8 @@ static unsigned char bridge_ula_lec[] = { 0x01, 0x80, 0xc2, 0x00, 0x00 };
|
|||
*/
|
||||
|
||||
static int lec_open(struct net_device *dev);
|
||||
static int lec_start_xmit(struct sk_buff *skb, struct net_device *dev);
|
||||
static netdev_tx_t lec_start_xmit(struct sk_buff *skb,
|
||||
struct net_device *dev);
|
||||
static int lec_close(struct net_device *dev);
|
||||
static void lec_init(struct net_device *dev);
|
||||
static struct lec_arp_table *lec_arp_find(struct lec_priv *priv,
|
||||
|
@ -247,7 +248,8 @@ static void lec_tx_timeout(struct net_device *dev)
|
|||
netif_wake_queue(dev);
|
||||
}
|
||||
|
||||
static int lec_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
static netdev_tx_t lec_start_xmit(struct sk_buff *skb,
|
||||
struct net_device *dev)
|
||||
{
|
||||
struct sk_buff *skb2;
|
||||
struct lec_priv *priv = netdev_priv(dev);
|
||||
|
|
|
@ -73,7 +73,8 @@ static void mpoad_close(struct atm_vcc *vcc);
|
|||
static int msg_from_mpoad(struct atm_vcc *vcc, struct sk_buff *skb);
|
||||
|
||||
static void mpc_push(struct atm_vcc *vcc, struct sk_buff *skb);
|
||||
static int mpc_send_packet(struct sk_buff *skb, struct net_device *dev);
|
||||
static netdev_tx_t mpc_send_packet(struct sk_buff *skb,
|
||||
struct net_device *dev);
|
||||
static int mpoa_event_listener(struct notifier_block *mpoa_notifier, unsigned long event, void *dev);
|
||||
static void mpc_timer_refresh(void);
|
||||
static void mpc_cache_check( unsigned long checking_time );
|
||||
|
@ -528,7 +529,8 @@ static int send_via_shortcut(struct sk_buff *skb, struct mpoa_client *mpc)
|
|||
/*
|
||||
* Probably needs some error checks and locking, not sure...
|
||||
*/
|
||||
static int mpc_send_packet(struct sk_buff *skb, struct net_device *dev)
|
||||
static netdev_tx_t mpc_send_packet(struct sk_buff *skb,
|
||||
struct net_device *dev)
|
||||
{
|
||||
struct mpoa_client *mpc;
|
||||
struct ethhdr *eth;
|
||||
|
|
Loading…
Reference in a new issue