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
use ovs_assert instead of assert
[sliver-openvswitch.git]
/
lib
/
netdev-tunnel.c
diff --git
a/lib/netdev-tunnel.c
b/lib/netdev-tunnel.c
index
797813b
..
9a7c358
100644
(file)
--- a/
lib/netdev-tunnel.c
+++ b/
lib/netdev-tunnel.c
@@
-73,7
+73,7
@@
is_tunnel_class(const struct netdev_class *class)
static struct netdev_dev_tunnel *
netdev_dev_tunnel_cast(const struct netdev_dev *netdev_dev)
{
static struct netdev_dev_tunnel *
netdev_dev_tunnel_cast(const struct netdev_dev *netdev_dev)
{
- assert(is_tunnel_class(netdev_dev_get_class(netdev_dev)));
+
ovs_
assert(is_tunnel_class(netdev_dev_get_class(netdev_dev)));
return CONTAINER_OF(netdev_dev, struct netdev_dev_tunnel, netdev_dev);
}
return CONTAINER_OF(netdev_dev, struct netdev_dev_tunnel, netdev_dev);
}
@@
-81,7
+81,7
@@
static struct netdev_tunnel *
netdev_tunnel_cast(const struct netdev *netdev)
{
struct netdev_dev *netdev_dev = netdev_get_dev(netdev);
netdev_tunnel_cast(const struct netdev *netdev)
{
struct netdev_dev *netdev_dev = netdev_get_dev(netdev);
- assert(is_tunnel_class(netdev_dev_get_class(netdev_dev)));
+
ovs_
assert(is_tunnel_class(netdev_dev_get_class(netdev_dev)));
return CONTAINER_OF(netdev, struct netdev_tunnel, netdev);
}
return CONTAINER_OF(netdev, struct netdev_tunnel, netdev);
}
@@
-170,7
+170,7
@@
netdev_tunnel_get_config(struct netdev_dev *dev_, struct smap *args)
if (netdev_dev->valid_remote_ip)
smap_add_format(args, "remote_ip", IP_FMT,
if (netdev_dev->valid_remote_ip)
smap_add_format(args, "remote_ip", IP_FMT,
- IP_ARGS(
&netdev_dev->remote_addr.sin
_addr));
+ IP_ARGS(
netdev_dev->remote_addr.sin_addr.s
_addr));
if (netdev_dev->valid_remote_port)
smap_add_format(args, "remote_port", "%"PRIu16,
ntohs(netdev_dev->remote_addr.sin_port));
if (netdev_dev->valid_remote_port)
smap_add_format(args, "remote_port", "%"PRIu16,
ntohs(netdev_dev->remote_addr.sin_port));
@@
-496,6
+496,7
@@
const struct netdev_class netdev_tunnel_class = {
netdev_tunnel_destroy,
netdev_tunnel_get_config,
netdev_tunnel_set_config,
netdev_tunnel_destroy,
netdev_tunnel_get_config,
netdev_tunnel_set_config,
+ NULL, /* get_tunnel_config */
netdev_tunnel_open,
netdev_tunnel_close,
netdev_tunnel_open,
netdev_tunnel_close,