aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-08-31 15:50:52 -0400
committerDavid S. Miller <davem@davemloft.net>2009-09-01 04:13:44 -0400
commit3a27c149ab0e31a7b86e5ee6a27bb3b8b5687f32 (patch)
treeab48f81ff1942d8d45a98b41be5493fb9cf631c0 /drivers
parent424efe9caf6047ffbcd6b383ff4d2347254aabf1 (diff)
uwb: convert to netdev_tx_t
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h3
-rw-r--r--drivers/uwb/i1480/i1480u-wlp/tx.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h b/drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h
index 3421d3339d7d..2e31f536a347 100644
--- a/drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h
+++ b/drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h
@@ -267,7 +267,8 @@ extern void i1480u_sysfs_release(struct i1480u *);
267/* netdev interface */ 267/* netdev interface */
268extern int i1480u_open(struct net_device *); 268extern int i1480u_open(struct net_device *);
269extern int i1480u_stop(struct net_device *); 269extern int i1480u_stop(struct net_device *);
270extern int i1480u_hard_start_xmit(struct sk_buff *, struct net_device *); 270extern netdev_tx_t i1480u_hard_start_xmit(struct sk_buff *,
271 struct net_device *);
271extern void i1480u_tx_timeout(struct net_device *); 272extern void i1480u_tx_timeout(struct net_device *);
272extern int i1480u_set_config(struct net_device *, struct ifmap *); 273extern int i1480u_set_config(struct net_device *, struct ifmap *);
273extern int i1480u_change_mtu(struct net_device *, int); 274extern int i1480u_change_mtu(struct net_device *, int);
diff --git a/drivers/uwb/i1480/i1480u-wlp/tx.c b/drivers/uwb/i1480/i1480u-wlp/tx.c
index 26bacc009c65..3db3449dbda4 100644
--- a/drivers/uwb/i1480/i1480u-wlp/tx.c
+++ b/drivers/uwb/i1480/i1480u-wlp/tx.c
@@ -503,7 +503,8 @@ out:
503 * 503 *
504 * @net_dev->xmit_lock is held 504 * @net_dev->xmit_lock is held
505 */ 505 */
506int i1480u_hard_start_xmit(struct sk_buff *skb, struct net_device *net_dev) 506netdev_tx_t i1480u_hard_start_xmit(struct sk_buff *skb,
507 struct net_device *net_dev)
507{ 508{
508 int result; 509 int result;
509 struct i1480u *i1480u = netdev_priv(net_dev); 510 struct i1480u *i1480u = netdev_priv(net_dev);