diff options
| author |   Luc Van Oostenryck <luc.vanoostenryck@gmail.com> | 2018-04-24 15:18:35 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-04-25 15:58:04 +0200 |
| commit | cae9bc7d7c202cd0bf44f062535264e60691118b (patch) | |
| tree | 2cbeb20b91dc5bce2ca714a170825a207670bee5 /drivers/staging | |
| parent | staging/wilc1000: fix wilc_mac_xmit()'s return type (diff) | |
| download | linux-dev-cae9bc7d7c202cd0bf44f062535264e60691118b.tar.xz linux-dev-cae9bc7d7c202cd0bf44f062535264e60691118b.zip | |
staging: wlan-ng: fix p80211knetdev_hard_start_xmit()'s return type
The method ndo_start_xmit() is defined as returning an 'netdev_tx_t',
which is a typedef for an enum type, but the implementation in this
driver returns an 'int'.
Fix this by returning 'netdev_tx_t' in this driver too.
Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/wlan-ng/p80211netdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/wlan-ng/p80211netdev.c b/drivers/staging/wlan-ng/p80211netdev.c index ec9cc00ee241..710ce839493d 100644 --- a/drivers/staging/wlan-ng/p80211netdev.c +++ b/drivers/staging/wlan-ng/p80211netdev.c @@ -95,7 +95,7 @@ static int p80211knetdev_init(struct net_device *netdev); static int p80211knetdev_open(struct net_device *netdev); static int p80211knetdev_stop(struct net_device *netdev); -static int p80211knetdev_hard_start_xmit(struct sk_buff *skb, +static netdev_tx_t p80211knetdev_hard_start_xmit(struct sk_buff *skb, struct net_device *netdev); static void p80211knetdev_set_multicast_list(struct net_device *dev); static int p80211knetdev_do_ioctl(struct net_device *dev, struct ifreq *ifr, @@ -321,7 +321,7 @@ static void p80211netdev_rx_bh(unsigned long arg) * zero on success, non-zero on failure. *---------------------------------------------------------------- */ -static int p80211knetdev_hard_start_xmit(struct sk_buff *skb, +static netdev_tx_t p80211knetdev_hard_start_xmit(struct sk_buff *skb, struct net_device *netdev) { int result = 0; |