On Mon, 2018-03-05 at 22:53 +0200, Or Gerlitz wrote:
> On Mon, Mar 5, 2018 at 10:46 PM, Saeed Mahameed <sae...@mellanox.com>
> wrote:
> > From: Aviad Yehezkel <avia...@mellanox.com>
> >
> > 1. Local fucntions should be static.
>
> s/fucntions/functions/
>
> > 2. Missing declarations warnings.
> >
> > Signed-off-by: Aviad Yehezkel <avia...@mellanox.com>
> > Signed-off-by: Saeed Mahameed <sae...@mellanox.com>
> > ---
> > drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 4 ++--
> > drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 1 +
> > drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c | 1 +
> > drivers/net/ethernet/mellanox/mlx5/core/lib/clock.h | 2 ++
> > 4 files changed, 6 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
> > b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
> > index 47bab842c5ee..a64b9226d281 100644
> > --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
> > +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
> > @@ -2994,8 +2994,8 @@ static int mlx5e_setup_tc_block(struct
> > net_device *dev,
> > }
> > #endif
> >
> > -int mlx5e_setup_tc(struct net_device *dev, enum tc_setup_type
> > type,
> > - void *type_data)
> > +static int mlx5e_setup_tc(struct net_device *dev, enum
> > tc_setup_type type,
> > + void *type_data)
> > {
> > switch (type) {
> > #ifdef CONFIG_MLX5_ESWITCH
>
> Saeed, this (and also the below change) seems like re-doing net
> commit
> 9afe9a5353778994d4396f3d5ff639221bfa5cc9 "net/mlx5e: Eliminate build
> warnings on no previous prototype", why?
>
Because the trees are not merged yet and byte to byte level the code is
identical nothing to worry about here.
I will drop this patch since we need to re=spin a V2 anyways and Aviad
will have to fix it later.
> > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
> > b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
> > index 80b84f6af2a1..59fe0ec5edcd 100644
> > --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
> > +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
> > @@ -34,6 +34,7 @@
> > #include <linux/ip.h>
> > #include <linux/ipv6.h>
> > #include <linux/tcp.h>
> > +#include <linux/bpf.h>
> > #include <linux/bpf_trace.h>
> > #include <net/busy_poll.h>
> > #include "en.h"
> > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c
> > b/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c
> > index e159243e0fcf..2ffa59ce7976 100644
> > --- a/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c
> > +++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c
> > @@ -33,6 +33,7 @@
> > #include <linux/clocksource.h>
> > #include <linux/highmem.h>
> > #include <rdma/mlx5-abi.h>
> > +#include "clock.h"
> > #include "en.h"
> >
> > enum {
> > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.h
> > b/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.h
> > index a8eecedd46c2..c200182aa0af 100644
> > --- a/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.h
> > +++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.h
> > @@ -30,6 +30,8 @@
> > * SOFTWARE.
> > */
> >
> > +#include <linux/mlx5/driver.h>
> > +
