diff mbox

[ovs-dev,ovn-ipv6,18/26] packets: Rename "rco_flags" to "rso_flags".

Message ID 1468306616-125783-19-git-send-email-jpettit@ovn.org
State Changes Requested
Headers show

Commit Message

Justin Pettit July 12, 2016, 6:56 a.m. UTC 
I presume the flags are supposed to map to neighbor discovery
advertisement "Router", "Solicited", and "Override" flags, which would
be "rso" instead of "rco".

Signed-off-by: Justin Pettit <jpettit@ovn.org>
---
 lib/packets.c | 6 +++---
 lib/packets.h | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

Comments

Ben Pfaff July 13, 2016, 7:54 p.m. UTC | #1 
On Mon, Jul 11, 2016 at 11:56:48PM -0700, Justin Pettit wrote:
> I presume the flags are supposed to map to neighbor discovery
> advertisement "Router", "Solicited", and "Override" flags, which would
> be "rso" instead of "rco".
> 
> Signed-off-by: Justin Pettit <jpettit@ovn.org>

After a little research, I don't have a better explanation.

Acked-by: Ben Pfaff <blp@ovn.org>
diff mbox

Patch

diff --git a/lib/packets.c b/lib/packets.c
index 9b34961..1437cb6 100644
--- a/lib/packets.c
+++ b/lib/packets.c
@@ -1378,7 +1378,7 @@  compose_nd_sol(struct dp_packet *b, const struct eth_addr eth_src,
 
     ns->icmph.icmp6_type = ND_NEIGHBOR_SOLICIT;
     ns->icmph.icmp6_code = 0;
-    put_16aligned_be32(&ns->rco_flags, htonl(0));
+    put_16aligned_be32(&ns->rso_flags, htonl(0));
 
     nd_opt = &ns->options[0];
     nd_opt->nd_opt_type = ND_OPT_SOURCE_LINKADDR;
@@ -1396,7 +1396,7 @@  void
 compose_nd_adv(struct dp_packet *b,
                const struct eth_addr eth_src, const struct eth_addr eth_dst,
                const struct in6_addr *ipv6_src, const struct in6_addr *ipv6_dst,
-               ovs_be32 rco_flags)
+               ovs_be32 rso_flags)
 {
     struct ovs_nd_msg *na;
     struct ovs_nd_opt *nd_opt;
@@ -1410,7 +1410,7 @@  compose_nd_adv(struct dp_packet *b,
 
     na->icmph.icmp6_type = ND_NEIGHBOR_ADVERT;
     na->icmph.icmp6_code = 0;
-    put_16aligned_be32(&na->rco_flags, rco_flags);
+    put_16aligned_be32(&na->rso_flags, rso_flags);
 
     nd_opt = &na->options[0];
     nd_opt->nd_opt_type = ND_OPT_TARGET_LINKADDR;
diff --git a/lib/packets.h b/lib/packets.h
index 2043175..28b742d 100644
--- a/lib/packets.h
+++ b/lib/packets.h
@@ -834,7 +834,7 @@  BUILD_ASSERT_DECL(ND_OPT_LEN == sizeof(struct ovs_nd_opt));
 #define ND_MSG_LEN 24
 struct ovs_nd_msg {
     struct icmp6_header icmph;
-    ovs_16aligned_be32 rco_flags;
+    ovs_16aligned_be32 rso_flags;
     union ovs_16aligned_in6_addr target;
     struct ovs_nd_opt options[0];
 };
@@ -1077,7 +1077,7 @@  void compose_nd_adv(struct dp_packet *, const struct eth_addr eth_src,
                     const struct eth_addr eth_dst,
                     const struct in6_addr *ipv6_src,
                     const struct in6_addr *ipv6_dst,
-                    ovs_be32 rco_flags);
+                    ovs_be32 rso_flags);
 uint32_t packet_csum_pseudoheader(const struct ip_header *);
 void IP_ECN_set_ce(struct dp_packet *pkt, bool is_ipv6);