aboutsummaryrefslogtreecommitdiff
path: root/lib/netdev-dummy.c
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2013-05-18 08:27:20 -0700
committerBen Pfaff <blp@nicira.com>2013-05-18 08:27:20 -0700
commit7c54c27f204ac9c7870ffab81aeba4d02336553a (patch)
treeaae0ed0d26102f52e5f5976ac6973c430f32a712 /lib/netdev-dummy.c
parentb4ccee7576e5bbc36764b88ad50f5052ecea25be (diff)
netdev-dummy: Remove FreeBSD dependency.
There's no particular reason that netdev_dummy_register() has to care about the particular OS, except that the tests like to use the special Linux-only tunnel vport types. But that can be done better, I think, by just always registering them from netdev_dummy_register() and making that function idempotent, so that calling it twice under Linux has no additional effect. This commit implements that solution. Signed-off-by: Ben Pfaff <blp@nicira.com> Acked-by: Ed Maste <emaste@freebsd.org>
Diffstat (limited to 'lib/netdev-dummy.c')
-rw-r--r--lib/netdev-dummy.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c
index 908fef24..14b286bb 100644
--- a/lib/netdev-dummy.c
+++ b/lib/netdev-dummy.c
@@ -36,12 +36,6 @@
VLOG_DEFINE_THIS_MODULE(netdev_dummy);
-#ifdef __FreeBSD__
-#define FREE_BSD 1
-#else
-#define FREE_BSD 0
-#endif
-
struct netdev_dummy {
struct netdev up;
uint8_t hwaddr[ETH_ADDR_LEN];
@@ -553,7 +547,5 @@ netdev_dummy_register(bool override)
}
netdev_register_provider(&dummy_class);
- if (FREE_BSD) {
- netdev_vport_tunnel_register();
- }
+ netdev_vport_tunnel_register();
}