git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prepare for post-2.2.0 (2.2.90).
[sliver-openvswitch.git]
/
utilities
/
ovs-vlan-bug-workaround.c
diff --git
a/utilities/ovs-vlan-bug-workaround.c
b/utilities/ovs-vlan-bug-workaround.c
index
54316dd
..
88fb2b1
100644
(file)
--- a/
utilities/ovs-vlan-bug-workaround.c
+++ b/
utilities/ovs-vlan-bug-workaround.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2011 Nicira
Networks
.
+ * Copyright (c) 2011 Nicira
, Inc
.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-23,6
+23,7
@@
#include <net/if.h>
#include <stdlib.h>
#include <sys/ioctl.h>
#include <net/if.h>
#include <stdlib.h>
#include <sys/ioctl.h>
+#include <sys/socket.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
@@
-113,7
+114,7
@@
parse_options(int argc, char *argv[])
static const struct option long_options[] = {
{"help", no_argument, NULL, 'h'},
{"version", no_argument, NULL, 'V'},
static const struct option long_options[] = {
{"help", no_argument, NULL, 'h'},
{"version", no_argument, NULL, 'V'},
- {
0, 0, 0
, 0},
+ {
NULL, 0, NULL
, 0},
};
char *short_options = long_options_to_short_options(long_options);
};
char *short_options = long_options_to_short_options(long_options);
@@
-130,14
+131,14
@@
parse_options(int argc, char *argv[])
break;
case 'V':
break;
case 'V':
-
OVS_PRINT_VERSION
(0, 0);
+
ovs_print_version
(0, 0);
exit(EXIT_SUCCESS);
case '?':
exit(EXIT_FAILURE);
default:
exit(EXIT_SUCCESS);
case '?':
exit(EXIT_FAILURE);
default:
- NOT_REACHED();
+
OVS_
NOT_REACHED();
}
}
free(short_options);
}
}
free(short_options);