Merge pull request #195 from pwieczorkiewicz/tuntap-fix

openSUSE · Mar 18, 2014 · 8d55386 · 8d55386
2 parents 4b41146 + 8fd603b
commit 8d55386
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/include/wicked/tuntap.h b/include/wicked/tuntap.h
@@ -30,7 +30,6 @@
 #include <wicked/types.h>
 
 struct ni_tuntap {
-	ni_bool_t	persistent; /* Always TRUE */
 	uid_t		owner;
 	gid_t		group;
 };

diff --git a/src/kernel.c b/src/kernel.c
@@ -242,7 +242,7 @@ __ni_tuntap_create(const ni_netdev_t *cfg)
 	if ((rv = ioctl(devfd, TUNSETIFF, (void *) &ifr)) < 0)
 		goto error;
 
-	if ((rv = ioctl(devfd, TUNSETPERSIST, cfg->tuntap->persistent)) < 0)
+	if ((rv = ioctl(devfd, TUNSETPERSIST, 1)) < 0)
 		goto error;
 
 	owner = cfg->tuntap->owner;

diff --git a/src/tuntap.c b/src/tuntap.c
@@ -46,7 +46,6 @@ static inline void
 __ni_tuntap_init(ni_tuntap_t *cfg)
 {
 	memset(cfg, 0, sizeof(*cfg));
-	cfg->persistent = TRUE;
 }
 
 /*
@@ -81,9 +80,6 @@ ni_tuntap_validate(const ni_tuntap_t *cfg)
 	if (cfg == NULL)
 		return "uninitialized tun/tap options";
 
-	if (FALSE == cfg->persistent)
-		return "Invalid/unsupported tun persistent setting (FALSE)";
-
 	if (cfg->owner == -1U)
 		return "Invalid/unset tun owner UID";