aboutsummaryrefslogtreecommitdiffstats
path: root/net/atm/mpc.c
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-08-31 15:50:42 -0400
committerDavid S. Miller <davem@davemloft.net>2009-09-01 04:13:10 -0400
commit3c805a22a3a178fc5aaadd518afa5358b78bf69e (patch)
treefe93630007876b4aaddb2fa8d92141df2f74e24c /net/atm/mpc.c
parent6fef4c0c8eeff7de13007a5f56113475444a253d (diff)
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.c6
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);
73static int msg_from_mpoad(struct atm_vcc *vcc, struct sk_buff *skb); 73static int msg_from_mpoad(struct atm_vcc *vcc, struct sk_buff *skb);
74 74
75static void mpc_push(struct atm_vcc *vcc, struct sk_buff *skb); 75static void mpc_push(struct atm_vcc *vcc, struct sk_buff *skb);
76static int mpc_send_packet(struct sk_buff *skb, struct net_device *dev); 76static netdev_tx_t mpc_send_packet(struct sk_buff *skb,
77 struct net_device *dev);
77static int mpoa_event_listener(struct notifier_block *mpoa_notifier, unsigned long event, void *dev); 78static int mpoa_event_listener(struct notifier_block *mpoa_notifier, unsigned long event, void *dev);
78static void mpc_timer_refresh(void); 79static void mpc_timer_refresh(void);
79static void mpc_cache_check( unsigned long checking_time ); 80static 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)
528/* 529/*
529 * Probably needs some error checks and locking, not sure... 530 * Probably needs some error checks and locking, not sure...
530 */ 531 */
531static int mpc_send_packet(struct sk_buff *skb, struct net_device *dev) 532static netdev_tx_t mpc_send_packet(struct sk_buff *skb,
533 struct net_device *dev)
532{ 534{
533 struct mpoa_client *mpc; 535 struct mpoa_client *mpc;
534 struct ethhdr *eth; 536 struct ethhdr *eth;