chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove unused includes
[elogind.git]
/
src
/
network
/
networkd-netdev-veth.c
diff --git
a/src/network/networkd-netdev-veth.c
b/src/network/networkd-netdev-veth.c
index ca2bb0718acfcb40331ca86bd078ce4a11dda496..9e9e1225e75bebb4776362bf1143f0751aeac48d 100644
(file)
--- a/
src/network/networkd-netdev-veth.c
+++ b/
src/network/networkd-netdev-veth.c
@@
-19,8
+19,6
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <netinet/ether.h>
-#include <arpa/inet.h>
#include <net/if.h>
#include <linux/veth.h>
#include <net/if.h>
#include <linux/veth.h>
@@
-38,7
+36,7
@@
static int netdev_veth_fill_message_create(NetDev *netdev, Link *link, sd_rtnl_m
r = sd_rtnl_message_open_container(m, VETH_INFO_PEER);
if (r < 0) {
r = sd_rtnl_message_open_container(m, VETH_INFO_PEER);
if (r < 0) {
- log_
error_netdev
(netdev,
+ log_
netdev_error
(netdev,
"Could not append VETH_INFO_PEER attribute: %s",
strerror(-r));
return r;
"Could not append VETH_INFO_PEER attribute: %s",
strerror(-r));
return r;
@@
-46,16
+44,14
@@
static int netdev_veth_fill_message_create(NetDev *netdev, Link *link, sd_rtnl_m
if (v->ifname_peer) {
r = sd_rtnl_message_append_string(m, IFLA_IFNAME, v->ifname_peer);
if (v->ifname_peer) {
r = sd_rtnl_message_append_string(m, IFLA_IFNAME, v->ifname_peer);
- if (r < 0) {
- log_error("Failed to add netlink interface name: %s", strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to add netlink interface name: %m");
}
if (v->mac_peer) {
r = sd_rtnl_message_append_ether_addr(m, IFLA_ADDRESS, v->mac_peer);
if (r < 0) {
}
if (v->mac_peer) {
r = sd_rtnl_message_append_ether_addr(m, IFLA_ADDRESS, v->mac_peer);
if (r < 0) {
- log_
error_netdev
(netdev,
+ log_
netdev_error
(netdev,
"Could not append IFLA_ADDRESS attribute: %s",
strerror(-r));
return r;
"Could not append IFLA_ADDRESS attribute: %s",
strerror(-r));
return r;
@@
-64,7
+60,7
@@
static int netdev_veth_fill_message_create(NetDev *netdev, Link *link, sd_rtnl_m
r = sd_rtnl_message_close_container(m);
if (r < 0) {
r = sd_rtnl_message_close_container(m);
if (r < 0) {
- log_
error_netdev
(netdev,
+ log_
netdev_error
(netdev,
"Could not append IFLA_INFO_DATA attribute: %s",
strerror(-r));
return r;
"Could not append IFLA_INFO_DATA attribute: %s",
strerror(-r));
return r;