Skip to content

Commit

Permalink
Fix the travis CI compilation error seen for osx job
Browse files Browse the repository at this point in the history
After the commit [1], travis CI job for osx [2] is failing with the below
error:

*****
In file included from lib/actions.c:25:
./lib/ovn-l7.h:246:9: error: 'ND_OPT_ROUTE_INFO' macro redefined [-Werror,-Wmacro-redefined]
        ^
/usr/include/netinet/icmp6.h:329:9: note: previous definition is here
*****

This patch renames the macro ND_OPT_ROUTE_INFO to ND_OPT_ROUTE_INFO_TYPE as this macro
is used to set the Route Information Option Type.

[1] - 9f7f466("Add support for Route Info Option in RA - RFC 4191")
[2] - https://travis-ci.org/ovn-org/ovn/jobs/634833728?utm_medium=notification&utm_source=github_status

Fixes- 9f7f466("Add support for Route Info Option in RA - RFC 4191")
CC: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Acked-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Numan Siddique <numans@ovn.org>
  • Loading branch information
numansiddique committed Jan 10, 2020
1 parent 6a57830 commit bcf6d23
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion controller/pinctrl.c
Expand Up @@ -2486,7 +2486,7 @@ packet_put_ra_route_info_opt(struct dp_packet *b, ovs_be32 lifetime,
for (t1 = strtok_r(t0, "-", &r1), index = 0; t1;
t1 = strtok_r(NULL, "-", &r1), index++) {

nd_rinfo.type = ND_OPT_ROUTE_INFO;
nd_rinfo.type = ND_OPT_ROUTE_INFO_TYPE;
nd_rinfo.route_lifetime = lifetime;

switch (index) {
Expand Down
4 changes: 2 additions & 2 deletions lib/ovn-l7.h
Expand Up @@ -243,10 +243,10 @@ struct ovs_nd_dnssl {
BUILD_ASSERT_DECL(ND_DNSSL_OPT_LEN == sizeof(struct ovs_nd_dnssl));

/* Route Information option RFC 4191 */
#define ND_OPT_ROUTE_INFO 24
#define ND_OPT_ROUTE_INFO_TYPE 24
#define ND_ROUTE_INFO_OPT_LEN 8
struct ovs_nd_route_info {
u_int8_t type; /* ND_OPT_ROUTE_INFO */
u_int8_t type; /* ND_OPT_ROUTE_INFO_TYPE */
u_int8_t len; /* 1, 2 or 3 */
u_int8_t prefix_len;
u_int8_t flags;
Expand Down

0 comments on commit bcf6d23

Please sign in to comment.