diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 19:50:42 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-01 01:13:10 -0700 |
| commit | 3c805a22a3a178fc5aaadd518afa5358b78bf69e (patch) | |
| tree | fe93630007876b4aaddb2fa8d92141df2f74e24c /net/atm/mpc.c | |
| parent | 6fef4c0c8eeff7de13007a5f56113475444a253d (diff) | |
| download | linux-stable-3c805a22a3a178fc5aaadd518afa5358b78bf69e.tar.gz linux-stable-3c805a22a3a178fc5aaadd518afa5358b78bf69e.tar.bz2 linux-stable-3c805a22a3a178fc5aaadd518afa5358b78bf69e.zip | |
convert ATM drivers to netdev_tx_t
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/atm/mpc.c')
| -rw-r--r-- | net/atm/mpc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/atm/mpc.c b/net/atm/mpc.c index 1ac4b94bf626..38a6cb0863f0 100644 --- a/net/atm/mpc.c +++ b/net/atm/mpc.c @@ -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; |