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
Merge branch 'master' into forward-port
[sliver-openvswitch.git]
/
lib
/
netdev.c
diff --git
a/lib/netdev.c
b/lib/netdev.c
index
1b76785
..
2b4dec4
100644
(file)
--- a/
lib/netdev.c
+++ b/
lib/netdev.c
@@
-79,8
+79,14
@@
netdev_initialize(void)
netdev_register_provider(&netdev_linux_class);
netdev_register_provider(&netdev_internal_class);
netdev_register_provider(&netdev_tap_class);
netdev_register_provider(&netdev_linux_class);
netdev_register_provider(&netdev_internal_class);
netdev_register_provider(&netdev_tap_class);
+ netdev_register_provider(&netdev_tap_pl_class);
netdev_vport_register();
#endif
netdev_vport_register();
#endif
+#ifdef __FreeBSD__
+ netdev_register_provider(&netdev_tap_class);
+ netdev_register_provider(&netdev_bsd_class);
+#endif
+ netdev_register_provider(&netdev_tunnel_class);
}
}
}
}
@@
-843,7
+849,7
@@
do_update_flags(struct netdev *netdev, enum netdev_flags off,
int
netdev_get_flags(const struct netdev *netdev_, enum netdev_flags *flagsp)
{
int
netdev_get_flags(const struct netdev *netdev_, enum netdev_flags *flagsp)
{
- struct netdev *netdev =
(struct netdev *) netdev_
;
+ struct netdev *netdev =
CONST_CAST(struct netdev *, netdev_)
;
return do_update_flags(netdev, 0, 0, flagsp, false);
}
return do_update_flags(netdev, 0, 0, flagsp, false);
}