blob: 9a713c6ce6ab79dc3f4713d39720811b3d5eeaa2 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
--- ./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 */
|
