diff mbox series

[U-Boot] net: remove duplicate definition of ETHADDR_WILDCARD

Message ID 20181122155832.4385-1-simon.k.r.goldschmidt@gmail.com
State Accepted
Commit 6880efdf5aa63ba3d598af68dbbbc2511a1a604f
Delegated to: Joe Hershberger
Headers show
Series [U-Boot] net: remove duplicate definition of ETHADDR_WILDCARD | expand

Commit Message

Simon Goldschmidt Nov. 22, 2018, 3:58 p.m. UTC 
ETHADDR_WILDCARD is defined as the same value in both env_flags.h
and env_callback.h

As env_callback.h includes env_flags.h, remove the duplicate definition
from env_callback.h

Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
---

 include/env_callback.h | 2 --
 1 file changed, 2 deletions(-)

Comments

Simon Goldschmidt Dec. 9, 2018, 8:51 p.m. UTC | #1 
Am 22.11.2018 um 16:58 schrieb Simon Goldschmidt:
> ETHADDR_WILDCARD is defined as the same value in both env_flags.h
> and env_callback.h
> 
> As env_callback.h includes env_flags.h, remove the duplicate definition
> from env_callback.h
> 
> Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
> ---
> 
>   include/env_callback.h | 2 --
>   1 file changed, 2 deletions(-)
> 
> diff --git a/include/env_callback.h b/include/env_callback.h
> index 3c44ff574b..507a52e13c 100644
> --- a/include/env_callback.h
> +++ b/include/env_callback.h
> @@ -32,10 +32,8 @@
>   
>   #ifdef CONFIG_REGEX
>   #define ENV_DOT_ESCAPE "\\"
> -#define ETHADDR_WILDCARD "\\d?"
>   #else
>   #define ENV_DOT_ESCAPE
> -#define ETHADDR_WILDCARD
>   #endif
>   
>   #ifdef CONFIG_CMD_DNS
> 

Ping?
Simon Goldschmidt Dec. 14, 2018, 8:55 a.m. UTC | #2 
+ Tom


On Sun, Dec 9, 2018 at 9:51 PM Simon Goldschmidt
<simon.k.r.goldschmidt@gmail.com> wrote:
>
> Am 22.11.2018 um 16:58 schrieb Simon Goldschmidt:
> > ETHADDR_WILDCARD is defined as the same value in both env_flags.h
> > and env_callback.h
> >
> > As env_callback.h includes env_flags.h, remove the duplicate definition
> > from env_callback.h
> >
> > Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
> > ---
> >
> >   include/env_callback.h | 2 --
> >   1 file changed, 2 deletions(-)
> >
> > diff --git a/include/env_callback.h b/include/env_callback.h
> > index 3c44ff574b..507a52e13c 100644
> > --- a/include/env_callback.h
> > +++ b/include/env_callback.h
> > @@ -32,10 +32,8 @@
> >
> >   #ifdef CONFIG_REGEX
> >   #define ENV_DOT_ESCAPE "\\"
> > -#define ETHADDR_WILDCARD "\\d?"
> >   #else
> >   #define ENV_DOT_ESCAPE
> > -#define ETHADDR_WILDCARD
> >   #endif
> >
> >   #ifdef CONFIG_CMD_DNS
> >
>
> Ping?

I haven't gotten an answer to this for nearly one month. It's a small
change, can this go in for v2019.01 please?

Regards,
Simon
Tom Rini Dec. 14, 2018, 1:28 p.m. UTC | #3 
On Fri, Dec 14, 2018 at 09:55:32AM +0100, Simon Goldschmidt wrote:
> + Tom
> 
> 
> On Sun, Dec 9, 2018 at 9:51 PM Simon Goldschmidt
> <simon.k.r.goldschmidt@gmail.com> wrote:
> >
> > Am 22.11.2018 um 16:58 schrieb Simon Goldschmidt:
> > > ETHADDR_WILDCARD is defined as the same value in both env_flags.h
> > > and env_callback.h
> > >
> > > As env_callback.h includes env_flags.h, remove the duplicate definition
> > > from env_callback.h
> > >
> > > Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
> > > ---
> > >
> > >   include/env_callback.h | 2 --
> > >   1 file changed, 2 deletions(-)
> > >
> > > diff --git a/include/env_callback.h b/include/env_callback.h
> > > index 3c44ff574b..507a52e13c 100644
> > > --- a/include/env_callback.h
> > > +++ b/include/env_callback.h
> > > @@ -32,10 +32,8 @@
> > >
> > >   #ifdef CONFIG_REGEX
> > >   #define ENV_DOT_ESCAPE "\\"
> > > -#define ETHADDR_WILDCARD "\\d?"
> > >   #else
> > >   #define ENV_DOT_ESCAPE
> > > -#define ETHADDR_WILDCARD
> > >   #endif
> > >
> > >   #ifdef CONFIG_CMD_DNS
> > >
> >
> > Ping?
> 
> I haven't gotten an answer to this for nearly one month. It's a small
> change, can this go in for v2019.01 please?

I'd filed this off to Joe to grab since it is indeed small and a
clean-up.
Simon Goldschmidt Dec. 14, 2018, 1:43 p.m. UTC | #4 
On Fri, Dec 14, 2018 at 2:28 PM Tom Rini <trini@konsulko.com> wrote:
>
> On Fri, Dec 14, 2018 at 09:55:32AM +0100, Simon Goldschmidt wrote:
> > + Tom
> >
> >
> > On Sun, Dec 9, 2018 at 9:51 PM Simon Goldschmidt
> > <simon.k.r.goldschmidt@gmail.com> wrote:
> > >
> > > Am 22.11.2018 um 16:58 schrieb Simon Goldschmidt:
> > > > ETHADDR_WILDCARD is defined as the same value in both env_flags.h
> > > > and env_callback.h
> > > >
> > > > As env_callback.h includes env_flags.h, remove the duplicate definition
> > > > from env_callback.h
> > > >
> > > > Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
> > > > ---
> > > >
> > > >   include/env_callback.h | 2 --
> > > >   1 file changed, 2 deletions(-)
> > > >
> > > > diff --git a/include/env_callback.h b/include/env_callback.h
> > > > index 3c44ff574b..507a52e13c 100644
> > > > --- a/include/env_callback.h
> > > > +++ b/include/env_callback.h
> > > > @@ -32,10 +32,8 @@
> > > >
> > > >   #ifdef CONFIG_REGEX
> > > >   #define ENV_DOT_ESCAPE "\\"
> > > > -#define ETHADDR_WILDCARD "\\d?"
> > > >   #else
> > > >   #define ENV_DOT_ESCAPE
> > > > -#define ETHADDR_WILDCARD
> > > >   #endif
> > > >
> > > >   #ifdef CONFIG_CMD_DNS
> > > >
> > >
> > > Ping?
> >
> > I haven't gotten an answer to this for nearly one month. It's a small
> > change, can this go in for v2019.01 please?
>
> I'd filed this off to Joe to grab since it is indeed small and a
> clean-up.

Well, I haven't heard from Joe since about one months now, that's why
I added you...

Regards,
Simon
Simon Goldschmidt Jan. 14, 2019, 3:42 p.m. UTC | #5 
Joe,

Am 14.12.2018 um 14:43 schrieb Simon Goldschmidt:
> On Fri, Dec 14, 2018 at 2:28 PM Tom Rini <trini@konsulko.com> wrote:
>>
>> On Fri, Dec 14, 2018 at 09:55:32AM +0100, Simon Goldschmidt wrote:
>>> + Tom
>>>
>>>
>>> On Sun, Dec 9, 2018 at 9:51 PM Simon Goldschmidt
>>> <simon.k.r.goldschmidt@gmail.com> wrote:
>>>>
>>>> Am 22.11.2018 um 16:58 schrieb Simon Goldschmidt:
>>>>> ETHADDR_WILDCARD is defined as the same value in both env_flags.h
>>>>> and env_callback.h
>>>>>
>>>>> As env_callback.h includes env_flags.h, remove the duplicate definition
>>>>> from env_callback.h
>>>>>
>>>>> Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
>>>>> ---
>>>>>
>>>>>    include/env_callback.h | 2 --
>>>>>    1 file changed, 2 deletions(-)
>>>>>
>>>>> diff --git a/include/env_callback.h b/include/env_callback.h
>>>>> index 3c44ff574b..507a52e13c 100644
>>>>> --- a/include/env_callback.h
>>>>> +++ b/include/env_callback.h
>>>>> @@ -32,10 +32,8 @@
>>>>>
>>>>>    #ifdef CONFIG_REGEX
>>>>>    #define ENV_DOT_ESCAPE "\\"
>>>>> -#define ETHADDR_WILDCARD "\\d?"
>>>>>    #else
>>>>>    #define ENV_DOT_ESCAPE
>>>>> -#define ETHADDR_WILDCARD
>>>>>    #endif
>>>>>
>>>>>    #ifdef CONFIG_CMD_DNS
>>>>>
>>>>
>>>> Ping?
>>>
>>> I haven't gotten an answer to this for nearly one month. It's a small
>>> change, can this go in for v2019.01 please?
>>
>> I'd filed this off to Joe to grab since it is indeed small and a
>> clean-up.
> 
> Well, I haven't heard from Joe since about one months now, that's why
> I added you...

Will you be taking this after the release or is there anything missing? 
It's assigned to you in patchwork but I didn't get any real reply...

Regards,
Simon
Joe Hershberger Jan. 15, 2019, 8:59 a.m. UTC | #6 
On Thu, Nov 22, 2018 at 9:58 AM Simon Goldschmidt
<simon.k.r.goldschmidt@gmail.com> wrote:
>
> ETHADDR_WILDCARD is defined as the same value in both env_flags.h
> and env_callback.h
>
> As env_callback.h includes env_flags.h, remove the duplicate definition
> from env_callback.h
>
> Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>

Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Simon Goldschmidt Jan. 22, 2019, 7:25 a.m. UTC | #7 
Hi Joe,

On Tue, Jan 15, 2019 at 10:00 AM Joe Hershberger <joe.hershberger@ni.com> wrote:
>
> On Thu, Nov 22, 2018 at 9:58 AM Simon Goldschmidt
> <simon.k.r.goldschmidt@gmail.com> wrote:
> >
> > ETHADDR_WILDCARD is defined as the same value in both env_flags.h
> > and env_callback.h
> >
> > As env_callback.h includes env_flags.h, remove the duplicate definition
> > from env_callback.h
> >
> > Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
>
> Acked-by: Joe Hershberger <joe.hershberger@ni.com>

I don't want to be annoying, but could you tell me when this patch
(and the other
3 I have pending in patchwork that are assigned to you) will make it
into the main
repository? Or if there's anything preventing that? I sent them mid of
November...

Thanks,
Simon
Joe Hershberger Jan. 22, 2019, 5:31 p.m. UTC | #8 
On Tue, Jan 22, 2019 at 1:26 AM Simon Goldschmidt
<simon.k.r.goldschmidt@gmail.com> wrote:
>
> Hi Joe,
>
> On Tue, Jan 15, 2019 at 10:00 AM Joe Hershberger <joe.hershberger@ni.com> wrote:
> >
> > On Thu, Nov 22, 2018 at 9:58 AM Simon Goldschmidt
> > <simon.k.r.goldschmidt@gmail.com> wrote:
> > >
> > > ETHADDR_WILDCARD is defined as the same value in both env_flags.h
> > > and env_callback.h
> > >
> > > As env_callback.h includes env_flags.h, remove the duplicate definition
> > > from env_callback.h
> > >
> > > Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
> >
> > Acked-by: Joe Hershberger <joe.hershberger@ni.com>
>
> I don't want to be annoying, but could you tell me when this patch
> (and the other
> 3 I have pending in patchwork that are assigned to you) will make it
> into the main
> repository? Or if there's anything preventing that? I sent them mid of
> November...

Sorry for the delay. I'll be build testing everything this week and if
all goes smoothly, I'll send a PR then.

Cheers,
-Joe
Simon Goldschmidt Jan. 22, 2019, 7:03 p.m. UTC | #9 
Am 22.01.2019 um 18:31 schrieb Joe Hershberger:
> On Tue, Jan 22, 2019 at 1:26 AM Simon Goldschmidt
> <simon.k.r.goldschmidt@gmail.com> wrote:
>>
>> Hi Joe,
>>
>> On Tue, Jan 15, 2019 at 10:00 AM Joe Hershberger <joe.hershberger@ni.com> wrote:
>>>
>>> On Thu, Nov 22, 2018 at 9:58 AM Simon Goldschmidt
>>> <simon.k.r.goldschmidt@gmail.com> wrote:
>>>>
>>>> ETHADDR_WILDCARD is defined as the same value in both env_flags.h
>>>> and env_callback.h
>>>>
>>>> As env_callback.h includes env_flags.h, remove the duplicate definition
>>>> from env_callback.h
>>>>
>>>> Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
>>>
>>> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
>>
>> I don't want to be annoying, but could you tell me when this patch
>> (and the other
>> 3 I have pending in patchwork that are assigned to you) will make it
>> into the main
>> repository? Or if there's anything preventing that? I sent them mid of
>> November...
> 
> Sorry for the delay. I'll be build testing everything this week and if
> all goes smoothly, I'll send a PR then.

OK, thanks!

Regards,
Simon
Joe Hershberger Jan. 24, 2019, 5:38 p.m. UTC | #10 
Hi Simon,

https://patchwork.ozlabs.org/patch/1001862/ was applied to http://git.denx.de/?p=u-boot/u-boot-net.git

Thanks!
-Joe
diff mbox series

Patch

diff --git a/include/env_callback.h b/include/env_callback.h
index 3c44ff574b..507a52e13c 100644
--- a/include/env_callback.h
+++ b/include/env_callback.h
@@ -32,10 +32,8 @@ 
 
 #ifdef CONFIG_REGEX
 #define ENV_DOT_ESCAPE "\\"
-#define ETHADDR_WILDCARD "\\d?"
 #else
 #define ENV_DOT_ESCAPE
-#define ETHADDR_WILDCARD
 #endif
 
 #ifdef CONFIG_CMD_DNS