diff mbox

[net-next] rename RTNH_F_EXTERNAL to RTNH_F_OFFLOAD

Message ID 1431494830-4284-1-git-send-email-roopa@cumulusnetworks.com
State Rejected, archived
Delegated to: David Miller
Headers show

Commit Message

Roopa Prabhu May 13, 2015, 5:27 a.m. UTC 
From: Roopa Prabhu <roopa@cumulusnetworks.com>

RTNH_F_EXTERNAL today is printed as "offload" in iproute2 output.

This patch renames the flag to be consistent with what the user sees.

(I will post iproute2 patch if this gets accepted)

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
---
 include/uapi/linux/rtnetlink.h |    2 +-
 net/ipv4/fib_trie.c            |    2 +-
 net/switchdev/switchdev.c      |    6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

Comments

Jiri Pirko May 13, 2015, 5:42 a.m. UTC | #1 
Wed, May 13, 2015 at 07:27:10AM CEST, roopa@cumulusnetworks.com wrote:
>From: Roopa Prabhu <roopa@cumulusnetworks.com>
>
>RTNH_F_EXTERNAL today is printed as "offload" in iproute2 output.
>
>This patch renames the flag to be consistent with what the user sees.
>
>(I will post iproute2 patch if this gets accepted)
>
>Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
>---
> include/uapi/linux/rtnetlink.h |    2 +-
> net/ipv4/fib_trie.c            |    2 +-
> net/switchdev/switchdev.c      |    6 +++---
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
>index 974db03..17fb02f 100644
>--- a/include/uapi/linux/rtnetlink.h
>+++ b/include/uapi/linux/rtnetlink.h
>@@ -337,7 +337,7 @@ struct rtnexthop {
> #define RTNH_F_DEAD		1	/* Nexthop is dead (used by multipath)	*/
> #define RTNH_F_PERVASIVE	2	/* Do recursive gateway lookup	*/
> #define RTNH_F_ONLINK		4	/* Gateway is forced on link	*/
>-#define RTNH_F_EXTERNAL		8	/* Route installed externally	*/
>+#define RTNH_F_OFFLOAD		8	/* offloaded route */

Since this is part of uapi, I believe this is not doable :/
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Daniel Borkmann May 13, 2015, 8:26 a.m. UTC | #2 
On 05/13/2015 07:42 AM, Jiri Pirko wrote:
> Wed, May 13, 2015 at 07:27:10AM CEST, roopa@cumulusnetworks.com wrote:
>> From: Roopa Prabhu <roopa@cumulusnetworks.com>
>>
>> RTNH_F_EXTERNAL today is printed as "offload" in iproute2 output.
>>
>> This patch renames the flag to be consistent with what the user sees.
>>
>> (I will post iproute2 patch if this gets accepted)
>>
>> Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
>> ---
>> include/uapi/linux/rtnetlink.h |    2 +-
>> net/ipv4/fib_trie.c            |    2 +-
>> net/switchdev/switchdev.c      |    6 +++---
>> 3 files changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
>> index 974db03..17fb02f 100644
>> --- a/include/uapi/linux/rtnetlink.h
>> +++ b/include/uapi/linux/rtnetlink.h
>> @@ -337,7 +337,7 @@ struct rtnexthop {
>> #define RTNH_F_DEAD		1	/* Nexthop is dead (used by multipath)	*/
>> #define RTNH_F_PERVASIVE	2	/* Do recursive gateway lookup	*/
>> #define RTNH_F_ONLINK		4	/* Gateway is forced on link	*/
>> -#define RTNH_F_EXTERNAL		8	/* Route installed externally	*/
>> +#define RTNH_F_OFFLOAD		8	/* offloaded route */
>
> Since this is part of uapi, I believe this is not doable :/

You could still alias it if necessary:

   #define RTNH_F_OFFLOAD	RTNH_F_EXTERNAL
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Roopa Prabhu May 13, 2015, 1:38 p.m. UTC | #3 
On 5/13/15, 1:26 AM, Daniel Borkmann wrote:
> On 05/13/2015 07:42 AM, Jiri Pirko wrote:
>> Wed, May 13, 2015 at 07:27:10AM CEST, roopa@cumulusnetworks.com wrote:
>>> From: Roopa Prabhu <roopa@cumulusnetworks.com>
>>>
>>> RTNH_F_EXTERNAL today is printed as "offload" in iproute2 output.
>>>
>>> This patch renames the flag to be consistent with what the user sees.
>>>
>>> (I will post iproute2 patch if this gets accepted)
>>>
>>> Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
>>> ---
>>> include/uapi/linux/rtnetlink.h |    2 +-
>>> net/ipv4/fib_trie.c            |    2 +-
>>> net/switchdev/switchdev.c      |    6 +++---
>>> 3 files changed, 5 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/include/uapi/linux/rtnetlink.h 
>>> b/include/uapi/linux/rtnetlink.h
>>> index 974db03..17fb02f 100644
>>> --- a/include/uapi/linux/rtnetlink.h
>>> +++ b/include/uapi/linux/rtnetlink.h
>>> @@ -337,7 +337,7 @@ struct rtnexthop {
>>> #define RTNH_F_DEAD        1    /* Nexthop is dead (used by 
>>> multipath)    */
>>> #define RTNH_F_PERVASIVE    2    /* Do recursive gateway lookup    */
>>> #define RTNH_F_ONLINK        4    /* Gateway is forced on link    */
>>> -#define RTNH_F_EXTERNAL        8    /* Route installed 
>>> externally    */
>>> +#define RTNH_F_OFFLOAD        8    /* offloaded route */
>>
>> Since this is part of uapi, I believe this is not doable :/
i thought it was not too late :) and besides i wasn't changing the value 
and just the name.
current iproute2 would still build for example.
>
> You could still alias it if necessary:
>
>   #define RTNH_F_OFFLOAD    RTNH_F_EXTERNAL
that is an option. hmm...wondering if it is worth creating an alias or 
we should live with it.
If i get more votes, i will resubmit.

thanks!.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller May 13, 2015, 4:13 p.m. UTC | #4 
From: roopa <roopa@cumulusnetworks.com>
Date: Wed, 13 May 2015 06:38:02 -0700

> On 5/13/15, 1:26 AM, Daniel Borkmann wrote:
>> On 05/13/2015 07:42 AM, Jiri Pirko wrote:
>>> Wed, May 13, 2015 at 07:27:10AM CEST, roopa@cumulusnetworks.com wrote:
>>>> From: Roopa Prabhu <roopa@cumulusnetworks.com>
>>>>
>>>> RTNH_F_EXTERNAL today is printed as "offload" in iproute2 output.
>>>>
>>>> This patch renames the flag to be consistent with what the user sees.
>>>>
>>>> (I will post iproute2 patch if this gets accepted)
>>>>
>>>> Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
>>>> ---
>>>> include/uapi/linux/rtnetlink.h |    2 +-
>>>> net/ipv4/fib_trie.c            |    2 +-
>>>> net/switchdev/switchdev.c      |    6 +++---
>>>> 3 files changed, 5 insertions(+), 5 deletions(-)
>>>>
>>>> diff --git a/include/uapi/linux/rtnetlink.h
>>>> b/include/uapi/linux/rtnetlink.h
>>>> index 974db03..17fb02f 100644
>>>> --- a/include/uapi/linux/rtnetlink.h
>>>> +++ b/include/uapi/linux/rtnetlink.h
>>>> @@ -337,7 +337,7 @@ struct rtnexthop {
>>>> #define RTNH_F_DEAD 1 /* Nexthop is dead (used by multipath) */
>>>> #define RTNH_F_PERVASIVE    2    /* Do recursive gateway lookup    */
>>>> #define RTNH_F_ONLINK        4    /* Gateway is forced on link    */
>>>> -#define RTNH_F_EXTERNAL        8    /* Route installed externally    */
>>>> +#define RTNH_F_OFFLOAD        8    /* offloaded route */
>>>
>>> Since this is part of uapi, I believe this is not doable :/
> i thought it was not too late :) and besides i wasn't changing the
> value and just the name.
> current iproute2 would still build for example.

If it made it into a release kernel, you cannot change it.

Period.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Roopa Prabhu May 13, 2015, 7:03 p.m. UTC | #5 
On 5/13/15, 9:13 AM, David Miller wrote:
> From: roopa <roopa@cumulusnetworks.com>
> Date: Wed, 13 May 2015 06:38:02 -0700
>
>> On 5/13/15, 1:26 AM, Daniel Borkmann wrote:
>>> On 05/13/2015 07:42 AM, Jiri Pirko wrote:
>>>> Wed, May 13, 2015 at 07:27:10AM CEST, roopa@cumulusnetworks.com wrote:
>>>>> From: Roopa Prabhu <roopa@cumulusnetworks.com>
>>>>>
>>>>> RTNH_F_EXTERNAL today is printed as "offload" in iproute2 output.
>>>>>
>>>>> This patch renames the flag to be consistent with what the user sees.
>>>>>
>>>>> (I will post iproute2 patch if this gets accepted)
>>>>>
>>>>> Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
>>>>> ---
>>>>> include/uapi/linux/rtnetlink.h |    2 +-
>>>>> net/ipv4/fib_trie.c            |    2 +-
>>>>> net/switchdev/switchdev.c      |    6 +++---
>>>>> 3 files changed, 5 insertions(+), 5 deletions(-)
>>>>>
>>>>> diff --git a/include/uapi/linux/rtnetlink.h
>>>>> b/include/uapi/linux/rtnetlink.h
>>>>> index 974db03..17fb02f 100644
>>>>> --- a/include/uapi/linux/rtnetlink.h
>>>>> +++ b/include/uapi/linux/rtnetlink.h
>>>>> @@ -337,7 +337,7 @@ struct rtnexthop {
>>>>> #define RTNH_F_DEAD 1 /* Nexthop is dead (used by multipath) */
>>>>> #define RTNH_F_PERVASIVE    2    /* Do recursive gateway lookup    */
>>>>> #define RTNH_F_ONLINK        4    /* Gateway is forced on link    */
>>>>> -#define RTNH_F_EXTERNAL        8    /* Route installed externally    */
>>>>> +#define RTNH_F_OFFLOAD        8    /* offloaded route */
>>>> Since this is part of uapi, I believe this is not doable :/
>> i thought it was not too late :) and besides i wasn't changing the
>> value and just the name.
>> current iproute2 would still build for example.
> If it made it into a release kernel, you cannot change it.
>
> Period.
Got it. But, I don't see the RTNH_F_EXTERNAL flag in 4.0. I will respin 
the patch against net.

thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
index 974db03..17fb02f 100644
--- a/include/uapi/linux/rtnetlink.h
+++ b/include/uapi/linux/rtnetlink.h
@@ -337,7 +337,7 @@  struct rtnexthop {
 #define RTNH_F_DEAD		1	/* Nexthop is dead (used by multipath)	*/
 #define RTNH_F_PERVASIVE	2	/* Do recursive gateway lookup	*/
 #define RTNH_F_ONLINK		4	/* Gateway is forced on link	*/
-#define RTNH_F_EXTERNAL		8	/* Route installed externally	*/
+#define RTNH_F_OFFLOAD		8	/* offloaded route */
 
 /* Macros to handle hexthops */
 
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 03444c6..d38aa7a 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -1762,7 +1762,7 @@  void fib_table_flush_external(struct fib_table *tb)
 			/* record local slen */
 			slen = fa->fa_slen;
 
-			if (!fi || !(fi->fib_flags & RTNH_F_EXTERNAL))
+			if (!fi || !(fi->fib_flags & RTNH_F_OFFLOAD))
 				continue;
 
 			switchdev_fib_ipv4_del(n->key, KEYLENGTH - fa->fa_slen,
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index 65d49d4..0457af7 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -674,7 +674,7 @@  int switchdev_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi,
 
 	err = switchdev_port_obj_add(dev, &fib_obj);
 	if (!err)
-		fi->fib_flags |= RTNH_F_EXTERNAL;
+		fi->fib_flags |= RTNH_F_OFFLOAD;
 
 	return err;
 }
@@ -710,7 +710,7 @@  int switchdev_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi,
 	struct net_device *dev;
 	int err = 0;
 
-	if (!(fi->fib_flags & RTNH_F_EXTERNAL))
+	if (!(fi->fib_flags & RTNH_F_OFFLOAD))
 		return 0;
 
 	dev = switchdev_get_dev_by_nhs(fi);
@@ -719,7 +719,7 @@  int switchdev_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi,
 
 	err = switchdev_port_obj_del(dev, &fib_obj);
 	if (!err)
-		fi->fib_flags &= ~RTNH_F_EXTERNAL;
+		fi->fib_flags &= ~RTNH_F_OFFLOAD;
 
 	return err;
 }