mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-29 02:11:16 +02:00
79 lines
1.8 KiB
Diff
79 lines
1.8 KiB
Diff
--- ./src/nm-device-ethernet.c.orig
|
|
+++ ./src/nm-device-ethernet.c
|
|
@@ -25,15 +25,16 @@
|
|
#include <netinet/in.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
-#include <linux/sockios.h>
|
|
-#include <linux/ethtool.h>
|
|
#include <sys/ioctl.h>
|
|
#include <unistd.h>
|
|
-#include <linux/if.h>
|
|
#include <errno.h>
|
|
#include <netinet/ether.h>
|
|
|
|
#include <gudev/gudev.h>
|
|
+
|
|
+#include <linux/sockios.h>
|
|
+#include <linux/ethtool.h>
|
|
+#include <linux/if.h>
|
|
|
|
#include "nm-glib-compat.h"
|
|
#include "nm-device-ethernet.h"
|
|
--- ./src/nm-device.c.orig
|
|
+++ ./src/nm-device.c
|
|
@@ -27,15 +27,12 @@
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <errno.h>
|
|
-#include <linux/sockios.h>
|
|
-#include <linux/ethtool.h>
|
|
#include <sys/ioctl.h>
|
|
#include <signal.h>
|
|
#include <sys/types.h>
|
|
#include <sys/wait.h>
|
|
#include <arpa/inet.h>
|
|
#include <fcntl.h>
|
|
-#include <linux/if.h>
|
|
|
|
#include "nm-glib-compat.h"
|
|
#include "nm-device.h"
|
|
@@ -67,6 +64,10 @@
|
|
#include "nm-manager-auth.h"
|
|
#include "nm-dbus-glib-types.h"
|
|
#include "nm-dispatcher.h"
|
|
+
|
|
+#include <linux/if.h>
|
|
+#include <linux/sockios.h>
|
|
+#include <linux/ethtool.h>
|
|
|
|
static void impl_device_disconnect (NMDevice *device, DBusGMethodInvocation *context);
|
|
|
|
--- ./src/nm-system.c.orig
|
|
+++ ./src/nm-system.c
|
|
@@ -40,11 +40,6 @@
|
|
#include <resolv.h>
|
|
#include <netdb.h>
|
|
#include <glib.h>
|
|
-#include <linux/if.h>
|
|
-#include <linux/sockios.h>
|
|
-#include <linux/if_bonding.h>
|
|
-#include <linux/if_vlan.h>
|
|
-#include <linux/if_bridge.h>
|
|
|
|
#include "nm-system.h"
|
|
#include "nm-device.h"
|
|
@@ -62,6 +57,12 @@
|
|
#include <netlink/route/link.h>
|
|
#include <netlink/route/link/bonding.h>
|
|
#include <netlink/route/link/vlan.h>
|
|
+
|
|
+#include <linux/if.h>
|
|
+#include <linux/sockios.h>
|
|
+#include <linux/if_bonding.h>
|
|
+#include <linux/if_vlan.h>
|
|
+#include <linux/if_bridge.h>
|
|
|
|
#if !HAVE_VLAN_FLAG_LOOSE_BINDING
|
|
/* Older kernels don't have this flag */
|