diff options
Diffstat (limited to 'drivers/uwb')
| -rw-r--r-- | drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h | 3 | ||||
| -rw-r--r-- | drivers/uwb/i1480/i1480u-wlp/tx.c | 3 | ||||
| -rw-r--r-- | drivers/uwb/lc-dev.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h b/drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h index 3421d3339d7..2e31f536a34 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 *); /* 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); diff --git a/drivers/uwb/i1480/i1480u-wlp/tx.c b/drivers/uwb/i1480/i1480u-wlp/tx.c index 26bacc009c6..3db3449dbda 100644 --- a/drivers/uwb/i1480/i1480u-wlp/tx.c +++ b/drivers/uwb/i1480/i1480u-wlp/tx.c @@ -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); diff --git a/drivers/uwb/lc-dev.c b/drivers/uwb/lc-dev.c index e9fe1bb7eb2..1097e81b56d 100644 --- a/drivers/uwb/lc-dev.c +++ b/drivers/uwb/lc-dev.c @@ -255,7 +255,7 @@ static struct attribute_group dev_attr_group = { .attrs = dev_attrs, }; -static struct attribute_group *groups[] = { +static const struct attribute_group *groups[] = { &dev_attr_group, NULL, }; |