chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: tuntap - return correct error when /dev/net/tun cannot be opened
[elogind.git]
/
src
/
network
/
networkd-netdev-tuntap.c
diff --git
a/src/network/networkd-netdev-tuntap.c
b/src/network/networkd-netdev-tuntap.c
index eef8747210431c8318dd975f776cadee0e52235c..eaf5df49718f14385372cf7b88f74ec73d72e390 100644
(file)
--- a/
src/network/networkd-netdev-tuntap.c
+++ b/
src/network/networkd-netdev-tuntap.c
@@
-63,17
+63,15
@@
static int netdev_tuntap_add(NetDev *netdev, struct ifreq *ifr) {
const char *group;
uid_t uid;
gid_t gid;
const char *group;
uid_t uid;
gid_t gid;
- int r
= 0
;
+ int r;
assert(netdev);
assert(ifr);
fd = open(TUN_DEV, O_RDWR);
if (fd < 0) {
assert(netdev);
assert(ifr);
fd = open(TUN_DEV, O_RDWR);
if (fd < 0) {
- log_error_netdev(netdev,
- "Failed to open tun dev: %s",
- strerror(-r));
- return r;
+ log_error_netdev(netdev, "Failed to open tun dev: %m");
+ return -errno;
}
r = ioctl(fd, TUNSETIFF, ifr);
}
r = ioctl(fd, TUNSETIFF, ifr);
@@
-139,7
+137,7
@@
static int netdev_tuntap_add(NetDev *netdev, struct ifreq *ifr) {
return r;
}
return r;
}
- return
r
;
+ return
0
;
}
static int netdev_create_tuntap(NetDev *netdev) {
}
static int netdev_create_tuntap(NetDev *netdev) {