Missing dependency spotted by Robert P Day.

[oweals/busybox.git] / networking / vconfig.c

diff --git a/networking/vconfig.c b/networking/vconfig.c
index d58c375f7918a1654cb83ee64f9ba47d01be1658..36458f784b81671c5bd36a2cac7f2ccbd3ea3aa4 100644 (file)
--- a/networking/vconfig.c
+++ b/networking/vconfig.c
@@ -27,13 +27,47 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
-#include <linux/if_vlan.h>
 #include <string.h>
 #include <limits.h>
 #include "busybox.h"
 
+/* Stuff from linux/if_vlan.h, kernel version 2.4.23 */
+enum vlan_ioctl_cmds {
+       ADD_VLAN_CMD,
+       DEL_VLAN_CMD,
+       SET_VLAN_INGRESS_PRIORITY_CMD,
+       SET_VLAN_EGRESS_PRIORITY_CMD,
+       GET_VLAN_INGRESS_PRIORITY_CMD,
+       GET_VLAN_EGRESS_PRIORITY_CMD,
+       SET_VLAN_NAME_TYPE_CMD,
+       SET_VLAN_FLAG_CMD
+};
+enum vlan_name_types {
+       VLAN_NAME_TYPE_PLUS_VID, /* Name will look like:  vlan0005 */
+       VLAN_NAME_TYPE_RAW_PLUS_VID, /* name will look like:  eth1.0005 */
+       VLAN_NAME_TYPE_PLUS_VID_NO_PAD, /* Name will look like:  vlan5 */
+       VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD, /* Name will look like:  eth0.5 */
+       VLAN_NAME_TYPE_HIGHEST
+};
+
+struct vlan_ioctl_args {
+       int cmd; /* Should be one of the vlan_ioctl_cmds enum above. */
+       char device1[24];
+
+       union {
+               char device2[24];
+               int VID;
+               unsigned int skb_priority;
+               unsigned int name_type;
+               unsigned int bind_type;
+               unsigned int flag; /* Matches vlan_dev_info flags */
+       } u;
+
+       short vlan_qos;
+};
+
 #define VLAN_GROUP_ARRAY_LEN 4096
-#define SIOCSIFVLAN    0x8983          /* Set 802.1Q VLAN options      */
+#define SIOCSIFVLAN    0x8983          /* Set 802.1Q VLAN options */
 
 /* On entry, table points to the length of the current string plus
  * nul terminator plus data length for the subsequent entry.  The
@@ -76,7 +110,7 @@ static const char name_types[] = {
        '_', 'P', 'L', 'U', 'S', '_', 'V', 'I', 'D',
        0,
        VLAN_NAME_TYPE_PLUS_VID_NO_PAD, 22,
-       'V', 'L', 'A', 'N', 
+       'V', 'L', 'A', 'N',
        '_', 'P', 'L', 'U', 'S', '_', 'V', 'I', 'D',
        '_', 'N', 'O', '_', 'P', 'A', 'D', 0,
        VLAN_NAME_TYPE_RAW_PLUS_VID, 15,