2018-04-24 13:27:48

by Luc Van Oostenryck

[permalink] [raw]

Subject: [PATCH] batman-adv: fix batadv_interface_tx()'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 <[email protected]>
---
net/batman-adv/soft-interface.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index edeffcb9f..e6c800b06 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -188,7 +188,7 @@ static void batadv_interface_set_rx_mode(struct net_device *dev)
{
}

-static int batadv_interface_tx(struct sk_buff *skb,
+static netdev_tx_t batadv_interface_tx(struct sk_buff *skb,
struct net_device *soft_iface)
{
struct ethhdr *ethhdr;
--
2.17.0

2018-04-24 13:50:19

by Sven Eckelmann

[permalink] [raw]

Subject: Re: [PATCH] batman-adv: fix batadv_interface_tx()'s return type

---

On Dienstag, 24. April 2018 15:18:46 CEST Luc Van Oostenryck wrote:
[...]
> -static int batadv_interface_tx(struct sk_buff *skb,
> +static netdev_tx_t batadv_interface_tx(struct sk_buff *skb,
> struct net_device *soft_iface)
> {
> struct ethhdr *ethhdr;
>

CHECK: Alignment should match open parenthesis
#76: FILE: net/batman-adv/soft-interface.c:192:
+static netdev_tx_t batadv_interface_tx(struct sk_buff *skb,
struct net_device *soft_iface)

Kind regards,
Sven

---

Attachments:

signature.asc (849.00 B)
This is a digitally signed message part.

2018-04-25 17:36:29

by Sven Eckelmann

[permalink] [raw]

Subject: Re: [B.A.T.M.A.N.] [PATCH] batman-adv: fix batadv_interface_tx()'s return type

---

On Dienstag, 24. April 2018 15:18:46 CEST Luc Van Oostenryck wrote:
> 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 <[email protected]>
> ---
> net/batman-adv/soft-interface.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

Applied as 6bf9e4d39a58 [1] but the alignment was fixed

Thanks,
Sven

[1] https://git.open-mesh.org/linux-merge.git/commit/6bf9e4d39a582a4beea1844d6955cb2ebc979a67

---

Attachments:

signature.asc (849.00 B)
This is a digitally signed message part.

2018-04-26 20:06:37

by Luc Van Oostenryck

[permalink] [raw]

Subject: Re: [B.A.T.M.A.N.] [PATCH] batman-adv: fix batadv_interface_tx()'s return type

---

On Wed, Apr 25, 2018 at 07:35:00PM +0200, Sven Eckelmann wrote:
> On Dienstag, 24. April 2018 15:18:46 CEST Luc Van Oostenryck wrote:
> > 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 <[email protected]>
> > ---
> > net/batman-adv/soft-interface.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Applied as 6bf9e4d39a58 [1] but the alignment was fixed

Thanks for this,
-- Luc