* [PATCH 0/2] Remove dead code and driver version
@ 2020-02-20 8:40 Leon Romanovsky
2020-02-20 8:40 ` [PATCH 1/2] um: Don't overwrite ethtool " Leon Romanovsky
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Leon Romanovsky @ 2020-02-20 8:40 UTC (permalink / raw)
To: Jeff Dike, Richard Weinberger, Anton Ivanov; +Cc: Leon Romanovsky, linux-um
From: Leon Romanovsky <leonro@mellanox.com>
Hi,
This short series is an outcome of the change in ethtool [1] to provide
proper driver version that will work reliably. The second patch is
removal of useless timer setup.
Code is compile tested only.
[1] https://lore.kernel.org/linux-rdma/20200127072028.19123-1-leon@kernel.org/
Leon Romanovsky (2):
um: Don't overwrite ethtool driver version
um: Delete never executed timer
arch/um/drivers/net_kern.c | 13 -------------
arch/um/drivers/vector_kern.c | 2 --
2 files changed, 15 deletions(-)
--
2.24.1
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/2] um: Don't overwrite ethtool driver version
2020-02-20 8:40 [PATCH 0/2] Remove dead code and driver version Leon Romanovsky
@ 2020-02-20 8:40 ` Leon Romanovsky
2020-02-20 19:35 ` Anton Ivanov
2020-02-20 8:40 ` [PATCH 2/2] um: Delete never executed timer Leon Romanovsky
2020-02-20 19:35 ` [PATCH 0/2] Remove dead code and driver version Anton Ivanov
2 siblings, 1 reply; 11+ messages in thread
From: Leon Romanovsky @ 2020-02-20 8:40 UTC (permalink / raw)
To: Jeff Dike, Richard Weinberger, Anton Ivanov; +Cc: Leon Romanovsky, linux-um
From: Leon Romanovsky <leonro@mellanox.com>
In-tree drivers don't need to manage internal version because
they are aligned to the global Linux kernel version, which is
reported by default with "ethtool -i".
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
---
arch/um/drivers/net_kern.c | 1 -
arch/um/drivers/vector_kern.c | 2 --
2 files changed, 3 deletions(-)
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 35ebeebfc1a8..af07733c2dc8 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -266,7 +266,6 @@ static void uml_net_get_drvinfo(struct net_device *dev,
struct ethtool_drvinfo *info)
{
strlcpy(info->driver, DRIVER_NAME, sizeof(info->driver));
- strlcpy(info->version, "42", sizeof(info->version));
}
static const struct ethtool_ops uml_net_ethtool_ops = {
diff --git a/arch/um/drivers/vector_kern.c b/arch/um/drivers/vector_kern.c
index 0ff86391f77d..9693dfca7651 100644
--- a/arch/um/drivers/vector_kern.c
+++ b/arch/um/drivers/vector_kern.c
@@ -46,7 +46,6 @@
#define DRIVER_NAME "uml-vector"
-#define DRIVER_VERSION "01"
struct vector_cmd_line_arg {
struct list_head list;
int unit;
@@ -1378,7 +1377,6 @@ static void vector_net_get_drvinfo(struct net_device *dev,
struct ethtool_drvinfo *info)
{
strlcpy(info->driver, DRIVER_NAME, sizeof(info->driver));
- strlcpy(info->version, DRIVER_VERSION, sizeof(info->version));
}
static int vector_net_load_bpf_flash(struct net_device *dev,
--
2.24.1
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/2] um: Delete never executed timer
2020-02-20 8:40 [PATCH 0/2] Remove dead code and driver version Leon Romanovsky
2020-02-20 8:40 ` [PATCH 1/2] um: Don't overwrite ethtool " Leon Romanovsky
@ 2020-02-20 8:40 ` Leon Romanovsky
2020-02-20 19:36 ` Anton Ivanov
2020-02-20 19:35 ` [PATCH 0/2] Remove dead code and driver version Anton Ivanov
2 siblings, 1 reply; 11+ messages in thread
From: Leon Romanovsky @ 2020-02-20 8:40 UTC (permalink / raw)
To: Jeff Dike, Richard Weinberger, Anton Ivanov; +Cc: Leon Romanovsky, linux-um
From: Leon Romanovsky <leonro@mellanox.com>
The "#ifdef undef" construction effectively disabled the timer.
It causes to the fact that this timer did nothing, so delete it.
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
---
arch/um/drivers/net_kern.c | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index af07733c2dc8..1802cf4ef5a5 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -274,17 +274,6 @@ static const struct ethtool_ops uml_net_ethtool_ops = {
.get_ts_info = ethtool_op_get_ts_info,
};
-static void uml_net_user_timer_expire(struct timer_list *t)
-{
-#ifdef undef
- struct uml_net_private *lp = from_timer(lp, t, tl);
- struct connection *conn = &lp->user;
-
- dprintk(KERN_INFO "uml_net_user_timer_expire [%p]\n", conn);
- do_connect(conn);
-#endif
-}
-
void uml_net_setup_etheraddr(struct net_device *dev, char *str)
{
unsigned char *addr = dev->dev_addr;
@@ -455,7 +444,6 @@ static void eth_configure(int n, void *init, char *mac,
.add_address = transport->user->add_address,
.delete_address = transport->user->delete_address });
- timer_setup(&lp->tl, uml_net_user_timer_expire, 0);
spin_lock_init(&lp->lock);
memcpy(lp->mac, dev->dev_addr, sizeof(lp->mac));
--
2.24.1
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 0/2] Remove dead code and driver version
2020-02-20 8:40 [PATCH 0/2] Remove dead code and driver version Leon Romanovsky
2020-02-20 8:40 ` [PATCH 1/2] um: Don't overwrite ethtool " Leon Romanovsky
2020-02-20 8:40 ` [PATCH 2/2] um: Delete never executed timer Leon Romanovsky
@ 2020-02-20 19:35 ` Anton Ivanov
2020-02-23 10:51 ` Leon Romanovsky
2 siblings, 1 reply; 11+ messages in thread
From: Anton Ivanov @ 2020-02-20 19:35 UTC (permalink / raw)
To: Leon Romanovsky, Jeff Dike, Richard Weinberger; +Cc: Leon Romanovsky, linux-um
On 20/02/2020 08:40, Leon Romanovsky wrote:
> From: Leon Romanovsky <leonro@mellanox.com>
>
> Hi,
>
> This short series is an outcome of the change in ethtool [1] to provide
> proper driver version that will work reliably. The second patch is
> removal of useless timer setup.
>
> Code is compile tested only.
>
> [1] https://lore.kernel.org/linux-rdma/20200127072028.19123-1-leon@kernel.org/
>
> Leon Romanovsky (2):
> um: Don't overwrite ethtool driver version
> um: Delete never executed timer
>
> arch/um/drivers/net_kern.c | 13 -------------
> arch/um/drivers/vector_kern.c | 2 --
> 2 files changed, 15 deletions(-)
>
> --
> 2.24.1
>
>
Acked-by: Anton Ivanov <anton.ivanov@cambridgegreys.com>
--
Anton R. Ivanov
Cambridge Greys Limited, England and Wales company No 10273661
http://www.cambridgegreys.com/
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] um: Don't overwrite ethtool driver version
2020-02-20 8:40 ` [PATCH 1/2] um: Don't overwrite ethtool " Leon Romanovsky
@ 2020-02-20 19:35 ` Anton Ivanov
2020-03-29 21:38 ` Richard Weinberger
0 siblings, 1 reply; 11+ messages in thread
From: Anton Ivanov @ 2020-02-20 19:35 UTC (permalink / raw)
To: Leon Romanovsky, Jeff Dike, Richard Weinberger; +Cc: Leon Romanovsky, linux-um
On 20/02/2020 08:40, Leon Romanovsky wrote:
> From: Leon Romanovsky <leonro@mellanox.com>
>
>
> In-tree drivers don't need to manage internal version because
> they are aligned to the global Linux kernel version, which is
> reported by default with "ethtool -i".
>
> Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
> ---
> arch/um/drivers/net_kern.c | 1 -
> arch/um/drivers/vector_kern.c | 2 --
> 2 files changed, 3 deletions(-)
>
> diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
> index 35ebeebfc1a8..af07733c2dc8 100644
> --- a/arch/um/drivers/net_kern.c
> +++ b/arch/um/drivers/net_kern.c
> @@ -266,7 +266,6 @@ static void uml_net_get_drvinfo(struct net_device *dev,
> struct ethtool_drvinfo *info)
> {
> strlcpy(info->driver, DRIVER_NAME, sizeof(info->driver));
> - strlcpy(info->version, "42", sizeof(info->version));
> }
>
> static const struct ethtool_ops uml_net_ethtool_ops = {
> diff --git a/arch/um/drivers/vector_kern.c b/arch/um/drivers/vector_kern.c
> index 0ff86391f77d..9693dfca7651 100644
> --- a/arch/um/drivers/vector_kern.c
> +++ b/arch/um/drivers/vector_kern.c
> @@ -46,7 +46,6 @@
>
>
> #define DRIVER_NAME "uml-vector"
> -#define DRIVER_VERSION "01"
> struct vector_cmd_line_arg {
> struct list_head list;
> int unit;
> @@ -1378,7 +1377,6 @@ static void vector_net_get_drvinfo(struct net_device *dev,
> struct ethtool_drvinfo *info)
> {
> strlcpy(info->driver, DRIVER_NAME, sizeof(info->driver));
> - strlcpy(info->version, DRIVER_VERSION, sizeof(info->version));
> }
>
> static int vector_net_load_bpf_flash(struct net_device *dev,
> --
> 2.24.1
>
>
Acked-by: Anton Ivanov <anton.ivanov@cambridgegreys.com>
--
Anton R. Ivanov
Cambridge Greys Limited, England and Wales company No 10273661
http://www.cambridgegreys.com/
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] um: Delete never executed timer
2020-02-20 8:40 ` [PATCH 2/2] um: Delete never executed timer Leon Romanovsky
@ 2020-02-20 19:36 ` Anton Ivanov
0 siblings, 0 replies; 11+ messages in thread
From: Anton Ivanov @ 2020-02-20 19:36 UTC (permalink / raw)
To: Leon Romanovsky, Jeff Dike, Richard Weinberger; +Cc: Leon Romanovsky, linux-um
On 20/02/2020 08:40, Leon Romanovsky wrote:
> From: Leon Romanovsky <leonro@mellanox.com>
>
>
> The "#ifdef undef" construction effectively disabled the timer.
> It causes to the fact that this timer did nothing, so delete it.
>
> Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
> ---
> arch/um/drivers/net_kern.c | 12 ------------
> 1 file changed, 12 deletions(-)
>
> diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
> index af07733c2dc8..1802cf4ef5a5 100644
> --- a/arch/um/drivers/net_kern.c
> +++ b/arch/um/drivers/net_kern.c
> @@ -274,17 +274,6 @@ static const struct ethtool_ops uml_net_ethtool_ops = {
> .get_ts_info = ethtool_op_get_ts_info,
> };
>
> -static void uml_net_user_timer_expire(struct timer_list *t)
> -{
> -#ifdef undef
> - struct uml_net_private *lp = from_timer(lp, t, tl);
> - struct connection *conn = &lp->user;
> -
> - dprintk(KERN_INFO "uml_net_user_timer_expire [%p]\n", conn);
> - do_connect(conn);
> -#endif
> -}
> -
> void uml_net_setup_etheraddr(struct net_device *dev, char *str)
> {
> unsigned char *addr = dev->dev_addr;
> @@ -455,7 +444,6 @@ static void eth_configure(int n, void *init, char *mac,
> .add_address = transport->user->add_address,
> .delete_address = transport->user->delete_address });
>
> - timer_setup(&lp->tl, uml_net_user_timer_expire, 0);
> spin_lock_init(&lp->lock);
> memcpy(lp->mac, dev->dev_addr, sizeof(lp->mac));
>
> --
> 2.24.1
>
>
Acked-by: Anton Ivanov <anton.ivanov@cambridgegreys.com>
--
Anton R. Ivanov
Cambridge Greys Limited, England and Wales company No 10273661
http://www.cambridgegreys.com/
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/2] Remove dead code and driver version
2020-02-20 19:35 ` [PATCH 0/2] Remove dead code and driver version Anton Ivanov
@ 2020-02-23 10:51 ` Leon Romanovsky
2020-02-23 19:58 ` Anton Ivanov
0 siblings, 1 reply; 11+ messages in thread
From: Leon Romanovsky @ 2020-02-23 10:51 UTC (permalink / raw)
To: Anton Ivanov; +Cc: Richard Weinberger, Jeff Dike, linux-um
On Thu, Feb 20, 2020 at 07:35:09PM +0000, Anton Ivanov wrote:
>
>
> On 20/02/2020 08:40, Leon Romanovsky wrote:
> > From: Leon Romanovsky <leonro@mellanox.com>
> >
> > Hi,
> >
> > This short series is an outcome of the change in ethtool [1] to provide
> > proper driver version that will work reliably. The second patch is
> > removal of useless timer setup.
> >
> > Code is compile tested only.
> >
> > [1] https://lore.kernel.org/linux-rdma/20200127072028.19123-1-leon@kernel.org/
> >
> > Leon Romanovsky (2):
> > um: Don't overwrite ethtool driver version
> > um: Delete never executed timer
> >
> > arch/um/drivers/net_kern.c | 13 -------------
> > arch/um/drivers/vector_kern.c | 2 --
> > 2 files changed, 15 deletions(-)
> >
> > --
> > 2.24.1
> >
> >
>
> Acked-by: Anton Ivanov <anton.ivanov@cambridgegreys.com>
Thanks Anton, I'm wondering if I expected to do some extra steps
to be sure that those patches will be sent in next merge window
to Linus?
Thanks
>
> --
> Anton R. Ivanov
>
> Cambridge Greys Limited, England and Wales company No 10273661
> http://www.cambridgegreys.com/
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/2] Remove dead code and driver version
2020-02-23 10:51 ` Leon Romanovsky
@ 2020-02-23 19:58 ` Anton Ivanov
2020-02-24 16:45 ` Leon Romanovsky
0 siblings, 1 reply; 11+ messages in thread
From: Anton Ivanov @ 2020-02-23 19:58 UTC (permalink / raw)
To: Leon Romanovsky; +Cc: Richard Weinberger, Jeff Dike, linux-um
On 23/02/2020 10:51, Leon Romanovsky wrote:
> On Thu, Feb 20, 2020 at 07:35:09PM +0000, Anton Ivanov wrote:
>>
>>
>> On 20/02/2020 08:40, Leon Romanovsky wrote:
>>> From: Leon Romanovsky <leonro@mellanox.com>
>>>
>>> Hi,
>>>
>>> This short series is an outcome of the change in ethtool [1] to provide
>>> proper driver version that will work reliably. The second patch is
>>> removal of useless timer setup.
>>>
>>> Code is compile tested only.
>>>
>>> [1] https://lore.kernel.org/linux-rdma/20200127072028.19123-1-leon@kernel.org/
>>>
>>> Leon Romanovsky (2):
>>> um: Don't overwrite ethtool driver version
>>> um: Delete never executed timer
>>>
>>> arch/um/drivers/net_kern.c | 13 -------------
>>> arch/um/drivers/vector_kern.c | 2 --
>>> 2 files changed, 15 deletions(-)
>>>
>>> --
>>> 2.24.1
>>>
>>>
>>
>> Acked-by: Anton Ivanov <anton.ivanov@cambridgegreys.com>
>
> Thanks Anton, I'm wondering if I expected to do some extra steps
> to be sure that those patches will be sent in next merge window
> to Linus?
"When" is Richard's decision. I just check and clear patches for the
time being.
Brgds,
>
> Thanks
>
>>
>> --
>> Anton R. Ivanov
>>
>> Cambridge Greys Limited, England and Wales company No 10273661
>> http://www.cambridgegreys.com/
>
> _______________________________________________
> linux-um mailing list
> linux-um@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-um
>
--
Anton R. Ivanov
Cambridgegreys Limited. Registered in England. Company Number 10273661
https://www.cambridgegreys.com/
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/2] Remove dead code and driver version
2020-02-23 19:58 ` Anton Ivanov
@ 2020-02-24 16:45 ` Leon Romanovsky
0 siblings, 0 replies; 11+ messages in thread
From: Leon Romanovsky @ 2020-02-24 16:45 UTC (permalink / raw)
To: Anton Ivanov, Richard Weinberger; +Cc: Jeff Dike, linux-um
On Sun, Feb 23, 2020 at 07:58:58PM +0000, Anton Ivanov wrote:
> On 23/02/2020 10:51, Leon Romanovsky wrote:
> > On Thu, Feb 20, 2020 at 07:35:09PM +0000, Anton Ivanov wrote:
> > >
> > >
> > > On 20/02/2020 08:40, Leon Romanovsky wrote:
> > > > From: Leon Romanovsky <leonro@mellanox.com>
> > > >
> > > > Hi,
> > > >
> > > > This short series is an outcome of the change in ethtool [1] to provide
> > > > proper driver version that will work reliably. The second patch is
> > > > removal of useless timer setup.
> > > >
> > > > Code is compile tested only.
> > > >
> > > > [1] https://lore.kernel.org/linux-rdma/20200127072028.19123-1-leon@kernel.org/
> > > >
> > > > Leon Romanovsky (2):
> > > > um: Don't overwrite ethtool driver version
> > > > um: Delete never executed timer
> > > >
> > > > arch/um/drivers/net_kern.c | 13 -------------
> > > > arch/um/drivers/vector_kern.c | 2 --
> > > > 2 files changed, 15 deletions(-)
> > > >
> > > > --
> > > > 2.24.1
> > > >
> > > >
> > >
> > > Acked-by: Anton Ivanov <anton.ivanov@cambridgegreys.com>
> >
> > Thanks Anton, I'm wondering if I expected to do some extra steps
> > to be sure that those patches will be sent in next merge window
> > to Linus?
>
> "When" is Richard's decision. I just check and clear patches for the time
> being.
Richard, any feedback?
Thanks
>
> Brgds,
>
> >
> > Thanks
> >
> > >
> > > --
> > > Anton R. Ivanov
> > >
> > > Cambridge Greys Limited, England and Wales company No 10273661
> > > http://www.cambridgegreys.com/
> >
> > _______________________________________________
> > linux-um mailing list
> > linux-um@lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-um
> >
>
>
> --
> Anton R. Ivanov
> Cambridgegreys Limited. Registered in England. Company Number 10273661
> https://www.cambridgegreys.com/
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] um: Don't overwrite ethtool driver version
2020-02-20 19:35 ` Anton Ivanov
@ 2020-03-29 21:38 ` Richard Weinberger
2020-03-30 7:22 ` Leon Romanovsky
0 siblings, 1 reply; 11+ messages in thread
From: Richard Weinberger @ 2020-03-29 21:38 UTC (permalink / raw)
To: Anton Ivanov
Cc: Richard Weinberger, Jeff Dike, linux-um, Leon Romanovsky,
Leon Romanovsky
On Thu, Feb 20, 2020 at 8:35 PM Anton Ivanov
<anton.ivanov@cambridgegreys.com> wrote:
>
>
>
> On 20/02/2020 08:40, Leon Romanovsky wrote:
> > From: Leon Romanovsky <leonro@mellanox.com>
> >
> >
> > In-tree drivers don't need to manage internal version because
> > they are aligned to the global Linux kernel version, which is
> > reported by default with "ethtool -i".
> >
> > Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
> > ---
> > arch/um/drivers/net_kern.c | 1 -
> > arch/um/drivers/vector_kern.c | 2 --
> > 2 files changed, 3 deletions(-)
> >
> > diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
> > index 35ebeebfc1a8..af07733c2dc8 100644
> > --- a/arch/um/drivers/net_kern.c
> > +++ b/arch/um/drivers/net_kern.c
> > @@ -266,7 +266,6 @@ static void uml_net_get_drvinfo(struct net_device *dev,
> > struct ethtool_drvinfo *info)
> > {
> > strlcpy(info->driver, DRIVER_NAME, sizeof(info->driver));
> > - strlcpy(info->version, "42", sizeof(info->version));
> > }
> >
> > static const struct ethtool_ops uml_net_ethtool_ops = {
> > diff --git a/arch/um/drivers/vector_kern.c b/arch/um/drivers/vector_kern.c
> > index 0ff86391f77d..9693dfca7651 100644
> > --- a/arch/um/drivers/vector_kern.c
> > +++ b/arch/um/drivers/vector_kern.c
> > @@ -46,7 +46,6 @@
> >
> >
> > #define DRIVER_NAME "uml-vector"
> > -#define DRIVER_VERSION "01"
> > struct vector_cmd_line_arg {
> > struct list_head list;
> > int unit;
> > @@ -1378,7 +1377,6 @@ static void vector_net_get_drvinfo(struct net_device *dev,
> > struct ethtool_drvinfo *info)
> > {
> > strlcpy(info->driver, DRIVER_NAME, sizeof(info->driver));
> > - strlcpy(info->version, DRIVER_VERSION, sizeof(info->version));
> > }
> >
> > static int vector_net_load_bpf_flash(struct net_device *dev,
> > --
> > 2.24.1
> >
> >
>
> Acked-by: Anton Ivanov <anton.ivanov@cambridgegreys.com>
Both patches applied, thanks!
--
Thanks,
//richard
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] um: Don't overwrite ethtool driver version
2020-03-29 21:38 ` Richard Weinberger
@ 2020-03-30 7:22 ` Leon Romanovsky
0 siblings, 0 replies; 11+ messages in thread
From: Leon Romanovsky @ 2020-03-30 7:22 UTC (permalink / raw)
To: Richard Weinberger; +Cc: Richard Weinberger, Jeff Dike, linux-um, Anton Ivanov
On Sun, Mar 29, 2020 at 11:38:10PM +0200, Richard Weinberger wrote:
> On Thu, Feb 20, 2020 at 8:35 PM Anton Ivanov
> <anton.ivanov@cambridgegreys.com> wrote:
> >
> >
> >
> > On 20/02/2020 08:40, Leon Romanovsky wrote:
> > > From: Leon Romanovsky <leonro@mellanox.com>
> > >
> > >
> > > In-tree drivers don't need to manage internal version because
> > > they are aligned to the global Linux kernel version, which is
> > > reported by default with "ethtool -i".
> > >
> > > Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
> > > ---
> > > arch/um/drivers/net_kern.c | 1 -
> > > arch/um/drivers/vector_kern.c | 2 --
> > > 2 files changed, 3 deletions(-)
> > >
> > > diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
> > > index 35ebeebfc1a8..af07733c2dc8 100644
> > > --- a/arch/um/drivers/net_kern.c
> > > +++ b/arch/um/drivers/net_kern.c
> > > @@ -266,7 +266,6 @@ static void uml_net_get_drvinfo(struct net_device *dev,
> > > struct ethtool_drvinfo *info)
> > > {
> > > strlcpy(info->driver, DRIVER_NAME, sizeof(info->driver));
> > > - strlcpy(info->version, "42", sizeof(info->version));
> > > }
> > >
> > > static const struct ethtool_ops uml_net_ethtool_ops = {
> > > diff --git a/arch/um/drivers/vector_kern.c b/arch/um/drivers/vector_kern.c
> > > index 0ff86391f77d..9693dfca7651 100644
> > > --- a/arch/um/drivers/vector_kern.c
> > > +++ b/arch/um/drivers/vector_kern.c
> > > @@ -46,7 +46,6 @@
> > >
> > >
> > > #define DRIVER_NAME "uml-vector"
> > > -#define DRIVER_VERSION "01"
> > > struct vector_cmd_line_arg {
> > > struct list_head list;
> > > int unit;
> > > @@ -1378,7 +1377,6 @@ static void vector_net_get_drvinfo(struct net_device *dev,
> > > struct ethtool_drvinfo *info)
> > > {
> > > strlcpy(info->driver, DRIVER_NAME, sizeof(info->driver));
> > > - strlcpy(info->version, DRIVER_VERSION, sizeof(info->version));
> > > }
> > >
> > > static int vector_net_load_bpf_flash(struct net_device *dev,
> > > --
> > > 2.24.1
> > >
> > >
> >
> > Acked-by: Anton Ivanov <anton.ivanov@cambridgegreys.com>
>
> Both patches applied, thanks!
Thanks for taking care.
>
> --
> Thanks,
> //richard
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2020-03-30 7:22 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-20 8:40 [PATCH 0/2] Remove dead code and driver version Leon Romanovsky
2020-02-20 8:40 ` [PATCH 1/2] um: Don't overwrite ethtool " Leon Romanovsky
2020-02-20 19:35 ` Anton Ivanov
2020-03-29 21:38 ` Richard Weinberger
2020-03-30 7:22 ` Leon Romanovsky
2020-02-20 8:40 ` [PATCH 2/2] um: Delete never executed timer Leon Romanovsky
2020-02-20 19:36 ` Anton Ivanov
2020-02-20 19:35 ` [PATCH 0/2] Remove dead code and driver version Anton Ivanov
2020-02-23 10:51 ` Leon Romanovsky
2020-02-23 19:58 ` Anton Ivanov
2020-02-24 16:45 ` Leon Romanovsky
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.