From 8b3ef15485bc8ff113621597ba220e3651b1538f Mon Sep 17 00:00:00 2001 From: Giuseppe Lettieri Date: Thu, 24 Jan 2013 11:01:18 +0100 Subject: [PATCH] fix compilation warnings --- lib/netdev-pltap.c | 5 +++-- lib/netdev-tunnel.c | 3 ++- lib/tunalloc.c | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/netdev-pltap.c b/lib/netdev-pltap.c index 6227308c4..58273dbcd 100644 --- a/lib/netdev-pltap.c +++ b/lib/netdev-pltap.c @@ -333,7 +333,7 @@ netdev_pltap_up(struct netdev_dev_pltap *dev) return vsys_transaction("vif_up", NULL, "%s\n"IP_FMT"\n%d\n", dev->real_name, - IP_ARGS(&dev->local_addr.sin_addr), + IP_ARGS(dev->local_addr.sin_addr.s_addr), dev->local_netmask); } @@ -395,7 +395,7 @@ netdev_pltap_get_config(struct netdev_dev *dev_, struct smap *args) if (netdev_dev->valid_local_ip) smap_add_format(args, "local_ip", IP_FMT, - IP_ARGS(&netdev_dev->local_addr.sin_addr)); + IP_ARGS(netdev_dev->local_addr.sin_addr.s_addr)); if (netdev_dev->valid_local_netmask) smap_add_format(args, "local_netmask", "%"PRIu32, ntohs(netdev_dev->local_netmask)); @@ -729,6 +729,7 @@ const struct netdev_class netdev_pltap_class = { netdev_pltap_destroy, netdev_pltap_get_config, netdev_pltap_set_config, + NULL, /* get_tunnel_config */ netdev_pltap_open, netdev_pltap_close, diff --git a/lib/netdev-tunnel.c b/lib/netdev-tunnel.c index 797813b05..a44095dc3 100644 --- a/lib/netdev-tunnel.c +++ b/lib/netdev-tunnel.c @@ -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, - 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)); @@ -496,6 +496,7 @@ const struct netdev_class netdev_tunnel_class = { netdev_tunnel_destroy, netdev_tunnel_get_config, netdev_tunnel_set_config, + NULL, /* get_tunnel_config */ netdev_tunnel_open, netdev_tunnel_close, diff --git a/lib/tunalloc.c b/lib/tunalloc.c index 4cb2f8e61..053b4a5cf 100644 --- a/lib/tunalloc.c +++ b/lib/tunalloc.c @@ -6,6 +6,7 @@ * new tuntap interface. Interface name can be acquired via TUNGETIFF ioctl. */ +#include #include #include #include -- 2.43.0