| Message ID | 20180424131847.5469-1-luc.vanoostenryck@gmail.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | batman-adv: fix batadv_interface_tx()'s return type | expand |
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
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 <luc.vanoostenryck@gmail.com> > --- > 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
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 <luc.vanoostenryck@gmail.com> > > --- > > 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
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;
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> --- net/batman-adv/soft-interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)