diff mbox

[13/19] uwb: convert to netdev_tx_t

Message ID 20090901055129.729527950@vyatta.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

stephen hemminger Sept. 1, 2009, 5:50 a.m. UTC 
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

Comments

David Vrabel Sept. 14, 2009, 10:47 a.m. UTC | #1 
Acked-by: David Vrabel <david.vrabel@csr.com>

David
diff mbox

Patch

--- a/drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h	2009-08-29 23:56:10.080512324 -0700
+++ b/drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h	2009-08-29 23:56:28.821492880 -0700
@@ -267,7 +267,8 @@  extern void i1480u_sysfs_release(struct 
 /* netdev interface */
 extern int i1480u_open(struct net_device *);
 extern int i1480u_stop(struct net_device *);
-extern int i1480u_hard_start_xmit(struct sk_buff *, struct net_device *);
+extern netdev_tx_t i1480u_hard_start_xmit(struct sk_buff *,
+						struct net_device *);
 extern void i1480u_tx_timeout(struct net_device *);
 extern int i1480u_set_config(struct net_device *, struct ifmap *);
 extern int i1480u_change_mtu(struct net_device *, int);
--- a/drivers/uwb/i1480/i1480u-wlp/tx.c	2009-08-29 23:54:51.001529161 -0700
+++ b/drivers/uwb/i1480/i1480u-wlp/tx.c	2009-08-29 23:55:57.929492420 -0700
@@ -503,7 +503,8 @@  out:
  *
  * @net_dev->xmit_lock is held
  */
-int i1480u_hard_start_xmit(struct sk_buff *skb, struct net_device *net_dev)
+netdev_tx_t i1480u_hard_start_xmit(struct sk_buff *skb,
+					 struct net_device *net_dev)
 {
 	int result;
 	struct i1480u *i1480u = netdev_priv(net_dev);