From: Justin Pettit <jpettit@ovn.org>
Date: Wed, 6 Jul 2016 23:19:40 +0000 (-0700)
Subject: packets: Rename "rco_flags" to "rso_flags".
X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fovs.git;a=commitdiff_plain;h=29d5e9a78332a0b9992cf4025788a5b2eec4a434

packets: Rename "rco_flags" to "rso_flags".

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>
Acked-by: Ben Pfaff <blp@ovn.org>
---

diff --git a/lib/packets.c b/lib/packets.c
index b9c179e2e..b5b23a64d 100644
--- a/lib/packets.c
+++ b/lib/packets.c
@@ -1361,7 +1361,7 @@ compose_nd(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;
@@ -1379,7 +1379,7 @@ void
 compose_na(struct dp_packet *b,
            const struct eth_addr eth_src, const struct eth_addr eth_dst,
            const ovs_be32 ipv6_src[4], const ovs_be32 ipv6_dst[4],
-           ovs_be32 rco_flags)
+           ovs_be32 rso_flags)
 {
     struct ovs_nd_msg *na;
     struct ovs_nd_opt *nd_opt;
@@ -1391,7 +1391,7 @@ compose_na(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 819366eb4..5835b4ec3 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];
 };
@@ -1075,7 +1075,7 @@ void compose_nd(struct dp_packet *, const struct eth_addr eth_src,
 void compose_na(struct dp_packet *,
                 const struct eth_addr eth_src, const struct eth_addr eth_dst,
                 const ovs_be32 ipv6_src[4], const ovs_be32 ipv6_dst[4],
-                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);