projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: Remove trailing whitespace
[openvswitch]
/
lib
/
netdev-linux.c
diff --git
a/lib/netdev-linux.c
b/lib/netdev-linux.c
index 09a461296c550d6d2310ee6df61250b68251330b..e6036bfc5f725746e99f549d86ff754a6b60dec1 100644
(file)
--- a/
lib/netdev-linux.c
+++ b/
lib/netdev-linux.c
@@
-53,7
+53,6
@@
#include "netlink.h"
#include "ofpbuf.h"
#include "openflow/openflow.h"
#include "netlink.h"
#include "ofpbuf.h"
#include "openflow/openflow.h"
-#include "openvswitch/gre.h"
#include "packets.h"
#include "poll-loop.h"
#include "port-array.h"
#include "packets.h"
#include "poll-loop.h"
#include "port-array.h"
@@
-61,9
+60,9
@@
#include "socket-util.h"
#include "shash.h"
#include "svec.h"
#include "socket-util.h"
#include "shash.h"
#include "svec.h"
-
-#define THIS_MODULE VLM_netdev_linux
#include "vlog.h"
#include "vlog.h"
+
+VLOG_DEFINE_THIS_MODULE(netdev_linux)
\f
/* These were introduced in Linux 2.6.14, so they might be missing if we have
* old headers. */
\f
/* These were introduced in Linux 2.6.14, so they might be missing if we have
* old headers. */
@@
-1009,7
+1008,7
@@
netdev_linux_update_is_pseudo(struct netdev_dev_linux *netdev_dev)
if (!(netdev_dev->cache_valid & VALID_IS_PSEUDO)) {
const char *name = netdev_dev_get_name(&netdev_dev->netdev_dev);
const char *type = netdev_dev_get_type(&netdev_dev->netdev_dev);
if (!(netdev_dev->cache_valid & VALID_IS_PSEUDO)) {
const char *name = netdev_dev_get_name(&netdev_dev->netdev_dev);
const char *type = netdev_dev_get_type(&netdev_dev->netdev_dev);
-
+
netdev_dev->is_tap = !strcmp(type, "tap");
netdev_dev->is_internal = false;
if (!netdev_dev->is_tap) {
netdev_dev->is_tap = !strcmp(type, "tap");
netdev_dev->is_internal = false;
if (!netdev_dev->is_tap) {
@@
-1873,7
+1872,7
@@
netdev_linux_get_next_hop(const struct in_addr *host, struct in_addr *next_hop,
iface, &dest, &gateway, &flags, &refcnt,
&use, &metric, &mask, &mtu, &window, &irtt) != 11) {
iface, &dest, &gateway, &flags, &refcnt,
&use, &metric, &mask, &mtu, &window, &irtt) != 11) {
- VLOG_WARN_RL(&rl, "%s: could not parse line %d: %s",
+ VLOG_WARN_RL(&rl, "%s: could not parse line %d: %s",
fn, ln, line);
continue;
}
fn, ln, line);
continue;
}
@@
-1883,7
+1882,7
@@
netdev_linux_get_next_hop(const struct in_addr *host, struct in_addr *next_hop,
}
/* The output of 'dest', 'mask', and 'gateway' were given in
}
/* The output of 'dest', 'mask', and 'gateway' were given in
- * network byte order, so we don't need need any endian
+ * network byte order, so we don't need need any endian
* conversions here. */
if ((dest & mask) == (host->s_addr & mask)) {
if (!gateway) {
* conversions here. */
if ((dest & mask) == (host->s_addr & mask)) {
if (!gateway) {