generic: disintegrate UAPI from include/linux/switch.h

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34677 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/generic/files/include/linux/switch.h b/target/linux/generic/files/include/linux/switch.h
index 4f4085e..bd4fae4 100644 (file)
--- a/target/linux/generic/files/include/linux/switch.h
+++ b/target/linux/generic/files/include/linux/switch.h
@@ -13,86 +13,11 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
+#ifndef _LINUX_SWITCH_H
+#define _LINUX_SWITCH_H
 
-#ifndef __LINUX_SWITCH_H
-#define __LINUX_SWITCH_H
-
-#include <linux/types.h>
-#include <linux/netdevice.h>
-#include <linux/netlink.h>
-#include <linux/genetlink.h>
-#ifndef __KERNEL__
-#include <netlink/netlink.h>
-#include <netlink/genl/genl.h>
-#include <netlink/genl/ctrl.h>
-#else
 #include <net/genetlink.h>
-#endif
-
-/* main attributes */
-enum {
-       SWITCH_ATTR_UNSPEC,
-       /* global */
-       SWITCH_ATTR_TYPE,
-       /* device */
-       SWITCH_ATTR_ID,
-       SWITCH_ATTR_DEV_NAME,
-       SWITCH_ATTR_ALIAS,
-       SWITCH_ATTR_NAME,
-       SWITCH_ATTR_VLANS,
-       SWITCH_ATTR_PORTS,
-       SWITCH_ATTR_CPU_PORT,
-       /* attributes */
-       SWITCH_ATTR_OP_ID,
-       SWITCH_ATTR_OP_TYPE,
-       SWITCH_ATTR_OP_NAME,
-       SWITCH_ATTR_OP_PORT,
-       SWITCH_ATTR_OP_VLAN,
-       SWITCH_ATTR_OP_VALUE_INT,
-       SWITCH_ATTR_OP_VALUE_STR,
-       SWITCH_ATTR_OP_VALUE_PORTS,
-       SWITCH_ATTR_OP_DESCRIPTION,
-       /* port lists */
-       SWITCH_ATTR_PORT,
-       SWITCH_ATTR_MAX
-};
-
-/* commands */
-enum {
-       SWITCH_CMD_UNSPEC,
-       SWITCH_CMD_GET_SWITCH,
-       SWITCH_CMD_NEW_ATTR,
-       SWITCH_CMD_LIST_GLOBAL,
-       SWITCH_CMD_GET_GLOBAL,
-       SWITCH_CMD_SET_GLOBAL,
-       SWITCH_CMD_LIST_PORT,
-       SWITCH_CMD_GET_PORT,
-       SWITCH_CMD_SET_PORT,
-       SWITCH_CMD_LIST_VLAN,
-       SWITCH_CMD_GET_VLAN,
-       SWITCH_CMD_SET_VLAN
-};
-
-/* data types */
-enum switch_val_type {
-       SWITCH_TYPE_UNSPEC,
-       SWITCH_TYPE_INT,
-       SWITCH_TYPE_STRING,
-       SWITCH_TYPE_PORTS,
-       SWITCH_TYPE_NOVAL,
-};
-
-/* port nested attributes */
-enum {
-       SWITCH_PORT_UNSPEC,
-       SWITCH_PORT_ID,
-       SWITCH_PORT_FLAG_TAGGED,
-       SWITCH_PORT_ATTR_MAX
-};
-
-#define SWITCH_ATTR_DEFAULTS_OFFSET    0x1000
-
-#ifdef __KERNEL__
+#include <uapi/linux/switch.h>
 
 struct switch_dev;
 struct switch_op;
@@ -232,6 +157,4 @@ struct switch_attr {
        int max;
 };
 
-#endif
-
-#endif
+#endif /* _LINUX_SWITCH_H */

diff --git a/target/linux/generic/files/include/uapi/linux/switch.h b/target/linux/generic/files/include/uapi/linux/switch.h
new file mode 100644 (file)
index 0000000..581caf1
--- /dev/null
+++ b/target/linux/generic/files/include/uapi/linux/switch.h
@@ -0,0 +1,94 @@
+/*
+ * switch.h: Switch configuration API
+ *
+ * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef _UAPI_LINUX_SWITCH_H
+#define _UAPI_LINUX_SWITCH_H
+
+#include <linux/types.h>
+#include <linux/netdevice.h>
+#include <linux/netlink.h>
+#include <linux/genetlink.h>
+#ifndef __KERNEL__
+#include <netlink/netlink.h>
+#include <netlink/genl/genl.h>
+#include <netlink/genl/ctrl.h>
+#endif
+
+/* main attributes */
+enum {
+       SWITCH_ATTR_UNSPEC,
+       /* global */
+       SWITCH_ATTR_TYPE,
+       /* device */
+       SWITCH_ATTR_ID,
+       SWITCH_ATTR_DEV_NAME,
+       SWITCH_ATTR_ALIAS,
+       SWITCH_ATTR_NAME,
+       SWITCH_ATTR_VLANS,
+       SWITCH_ATTR_PORTS,
+       SWITCH_ATTR_CPU_PORT,
+       /* attributes */
+       SWITCH_ATTR_OP_ID,
+       SWITCH_ATTR_OP_TYPE,
+       SWITCH_ATTR_OP_NAME,
+       SWITCH_ATTR_OP_PORT,
+       SWITCH_ATTR_OP_VLAN,
+       SWITCH_ATTR_OP_VALUE_INT,
+       SWITCH_ATTR_OP_VALUE_STR,
+       SWITCH_ATTR_OP_VALUE_PORTS,
+       SWITCH_ATTR_OP_DESCRIPTION,
+       /* port lists */
+       SWITCH_ATTR_PORT,
+       SWITCH_ATTR_MAX
+};
+
+/* commands */
+enum {
+       SWITCH_CMD_UNSPEC,
+       SWITCH_CMD_GET_SWITCH,
+       SWITCH_CMD_NEW_ATTR,
+       SWITCH_CMD_LIST_GLOBAL,
+       SWITCH_CMD_GET_GLOBAL,
+       SWITCH_CMD_SET_GLOBAL,
+       SWITCH_CMD_LIST_PORT,
+       SWITCH_CMD_GET_PORT,
+       SWITCH_CMD_SET_PORT,
+       SWITCH_CMD_LIST_VLAN,
+       SWITCH_CMD_GET_VLAN,
+       SWITCH_CMD_SET_VLAN
+};
+
+/* data types */
+enum switch_val_type {
+       SWITCH_TYPE_UNSPEC,
+       SWITCH_TYPE_INT,
+       SWITCH_TYPE_STRING,
+       SWITCH_TYPE_PORTS,
+       SWITCH_TYPE_NOVAL,
+};
+
+/* port nested attributes */
+enum {
+       SWITCH_PORT_UNSPEC,
+       SWITCH_PORT_ID,
+       SWITCH_PORT_FLAG_TAGGED,
+       SWITCH_PORT_ATTR_MAX
+};
+
+#define SWITCH_ATTR_DEFAULTS_OFFSET    0x1000
+
+
+#endif /* _UAPI_LINUX_SWITCH_H */

diff --git a/target/linux/generic/patches-3.3/a03-swconfig-revert-UAPI-disintegration.patch b/target/linux/generic/patches-3.3/a03-swconfig-revert-UAPI-disintegration.patch
new file mode 100644 (file)
index 0000000..569fd0c
--- /dev/null
+++ b/target/linux/generic/patches-3.3/a03-swconfig-revert-UAPI-disintegration.patch
@@ -0,0 +1,100 @@
+--- a/include/linux/switch.h
++++ b/include/linux/switch.h
+@@ -13,11 +13,86 @@
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  */
+-#ifndef _LINUX_SWITCH_H
+-#define _LINUX_SWITCH_H
+ 
++#ifndef __LINUX_SWITCH_H
++#define __LINUX_SWITCH_H
++
++#include <linux/types.h>
++#include <linux/netdevice.h>
++#include <linux/netlink.h>
++#include <linux/genetlink.h>
++#ifndef __KERNEL__
++#include <netlink/netlink.h>
++#include <netlink/genl/genl.h>
++#include <netlink/genl/ctrl.h>
++#else
+ #include <net/genetlink.h>
+-#include <uapi/linux/switch.h>
++#endif
++
++/* main attributes */
++enum {
++      SWITCH_ATTR_UNSPEC,
++      /* global */
++      SWITCH_ATTR_TYPE,
++      /* device */
++      SWITCH_ATTR_ID,
++      SWITCH_ATTR_DEV_NAME,
++      SWITCH_ATTR_ALIAS,
++      SWITCH_ATTR_NAME,
++      SWITCH_ATTR_VLANS,
++      SWITCH_ATTR_PORTS,
++      SWITCH_ATTR_CPU_PORT,
++      /* attributes */
++      SWITCH_ATTR_OP_ID,
++      SWITCH_ATTR_OP_TYPE,
++      SWITCH_ATTR_OP_NAME,
++      SWITCH_ATTR_OP_PORT,
++      SWITCH_ATTR_OP_VLAN,
++      SWITCH_ATTR_OP_VALUE_INT,
++      SWITCH_ATTR_OP_VALUE_STR,
++      SWITCH_ATTR_OP_VALUE_PORTS,
++      SWITCH_ATTR_OP_DESCRIPTION,
++      /* port lists */
++      SWITCH_ATTR_PORT,
++      SWITCH_ATTR_MAX
++};
++
++/* commands */
++enum {
++      SWITCH_CMD_UNSPEC,
++      SWITCH_CMD_GET_SWITCH,
++      SWITCH_CMD_NEW_ATTR,
++      SWITCH_CMD_LIST_GLOBAL,
++      SWITCH_CMD_GET_GLOBAL,
++      SWITCH_CMD_SET_GLOBAL,
++      SWITCH_CMD_LIST_PORT,
++      SWITCH_CMD_GET_PORT,
++      SWITCH_CMD_SET_PORT,
++      SWITCH_CMD_LIST_VLAN,
++      SWITCH_CMD_GET_VLAN,
++      SWITCH_CMD_SET_VLAN
++};
++
++/* data types */
++enum switch_val_type {
++      SWITCH_TYPE_UNSPEC,
++      SWITCH_TYPE_INT,
++      SWITCH_TYPE_STRING,
++      SWITCH_TYPE_PORTS,
++      SWITCH_TYPE_NOVAL,
++};
++
++/* port nested attributes */
++enum {
++      SWITCH_PORT_UNSPEC,
++      SWITCH_PORT_ID,
++      SWITCH_PORT_FLAG_TAGGED,
++      SWITCH_PORT_ATTR_MAX
++};
++
++#define SWITCH_ATTR_DEFAULTS_OFFSET   0x1000
++
++#ifdef __KERNEL__
+ 
+ struct switch_dev;
+ struct switch_op;
+@@ -157,4 +232,6 @@ struct switch_attr {
+       int max;
+ };
+ 
+-#endif /* _LINUX_SWITCH_H */
++#endif
++
++#endif

diff --git a/target/linux/generic/patches-3.6/a03-swconfig-revert-UAPI-disintegration.patch b/target/linux/generic/patches-3.6/a03-swconfig-revert-UAPI-disintegration.patch
new file mode 100644 (file)
index 0000000..569fd0c
--- /dev/null
+++ b/target/linux/generic/patches-3.6/a03-swconfig-revert-UAPI-disintegration.patch
@@ -0,0 +1,100 @@
+--- a/include/linux/switch.h
++++ b/include/linux/switch.h
+@@ -13,11 +13,86 @@
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  */
+-#ifndef _LINUX_SWITCH_H
+-#define _LINUX_SWITCH_H
+ 
++#ifndef __LINUX_SWITCH_H
++#define __LINUX_SWITCH_H
++
++#include <linux/types.h>
++#include <linux/netdevice.h>
++#include <linux/netlink.h>
++#include <linux/genetlink.h>
++#ifndef __KERNEL__
++#include <netlink/netlink.h>
++#include <netlink/genl/genl.h>
++#include <netlink/genl/ctrl.h>
++#else
+ #include <net/genetlink.h>
+-#include <uapi/linux/switch.h>
++#endif
++
++/* main attributes */
++enum {
++      SWITCH_ATTR_UNSPEC,
++      /* global */
++      SWITCH_ATTR_TYPE,
++      /* device */
++      SWITCH_ATTR_ID,
++      SWITCH_ATTR_DEV_NAME,
++      SWITCH_ATTR_ALIAS,
++      SWITCH_ATTR_NAME,
++      SWITCH_ATTR_VLANS,
++      SWITCH_ATTR_PORTS,
++      SWITCH_ATTR_CPU_PORT,
++      /* attributes */
++      SWITCH_ATTR_OP_ID,
++      SWITCH_ATTR_OP_TYPE,
++      SWITCH_ATTR_OP_NAME,
++      SWITCH_ATTR_OP_PORT,
++      SWITCH_ATTR_OP_VLAN,
++      SWITCH_ATTR_OP_VALUE_INT,
++      SWITCH_ATTR_OP_VALUE_STR,
++      SWITCH_ATTR_OP_VALUE_PORTS,
++      SWITCH_ATTR_OP_DESCRIPTION,
++      /* port lists */
++      SWITCH_ATTR_PORT,
++      SWITCH_ATTR_MAX
++};
++
++/* commands */
++enum {
++      SWITCH_CMD_UNSPEC,
++      SWITCH_CMD_GET_SWITCH,
++      SWITCH_CMD_NEW_ATTR,
++      SWITCH_CMD_LIST_GLOBAL,
++      SWITCH_CMD_GET_GLOBAL,
++      SWITCH_CMD_SET_GLOBAL,
++      SWITCH_CMD_LIST_PORT,
++      SWITCH_CMD_GET_PORT,
++      SWITCH_CMD_SET_PORT,
++      SWITCH_CMD_LIST_VLAN,
++      SWITCH_CMD_GET_VLAN,
++      SWITCH_CMD_SET_VLAN
++};
++
++/* data types */
++enum switch_val_type {
++      SWITCH_TYPE_UNSPEC,
++      SWITCH_TYPE_INT,
++      SWITCH_TYPE_STRING,
++      SWITCH_TYPE_PORTS,
++      SWITCH_TYPE_NOVAL,
++};
++
++/* port nested attributes */
++enum {
++      SWITCH_PORT_UNSPEC,
++      SWITCH_PORT_ID,
++      SWITCH_PORT_FLAG_TAGGED,
++      SWITCH_PORT_ATTR_MAX
++};
++
++#define SWITCH_ATTR_DEFAULTS_OFFSET   0x1000
++
++#ifdef __KERNEL__
+ 
+ struct switch_dev;
+ struct switch_op;
+@@ -157,4 +232,6 @@ struct switch_attr {
+       int max;
+ };
+ 
+-#endif /* _LINUX_SWITCH_H */
++#endif
++
++#endif

diff --git a/target/linux/generic/patches-3.7/700-swconfig.patch b/target/linux/generic/patches-3.7/700-swconfig.patch
index 0a5b76e..7c92d34 100644 (file)
--- a/target/linux/generic/patches-3.7/700-swconfig.patch
+++ b/target/linux/generic/patches-3.7/700-swconfig.patch
@@ -27,3 +27,13 @@
  obj-$(CONFIG_MARVELL_PHY)     += marvell.o
  obj-$(CONFIG_DAVICOM_PHY)     += davicom.o
  obj-$(CONFIG_CICADA_PHY)      += cicada.o
+--- a/include/uapi/linux/Kbuild
++++ b/include/uapi/linux/Kbuild
+@@ -355,6 +355,7 @@ header-y += stddef.h
+ header-y += string.h
+ header-y += suspend_ioctls.h
+ header-y += swab.h
++header-y += switch.h
+ header-y += synclink.h
+ header-y += sysctl.h
+ header-y += sysinfo.h