Changeset 34677


Ignore:
Timestamp:
2012-12-14T13:11:41+01:00 (5 years ago)
Author:
juhosg
Message:

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

Signed-off-by: Gabor Juhos <juhosg@…>

Location:
trunk/target/linux/generic
Files:
5 added
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/target/linux/generic/files/include/linux/switch.h

    r30952 r34677  
    1414 * GNU General Public License for more details. 
    1515 */ 
     16#ifndef _LINUX_SWITCH_H 
     17#define _LINUX_SWITCH_H 
    1618 
    17 #ifndef __LINUX_SWITCH_H 
    18 #define __LINUX_SWITCH_H 
    19  
    20 #include <linux/types.h> 
    21 #include <linux/netdevice.h> 
    22 #include <linux/netlink.h> 
    23 #include <linux/genetlink.h> 
    24 #ifndef __KERNEL__ 
    25 #include <netlink/netlink.h> 
    26 #include <netlink/genl/genl.h> 
    27 #include <netlink/genl/ctrl.h> 
    28 #else 
    2919#include <net/genetlink.h> 
    30 #endif 
    31  
    32 /* main attributes */ 
    33 enum { 
    34         SWITCH_ATTR_UNSPEC, 
    35         /* global */ 
    36         SWITCH_ATTR_TYPE, 
    37         /* device */ 
    38         SWITCH_ATTR_ID, 
    39         SWITCH_ATTR_DEV_NAME, 
    40         SWITCH_ATTR_ALIAS, 
    41         SWITCH_ATTR_NAME, 
    42         SWITCH_ATTR_VLANS, 
    43         SWITCH_ATTR_PORTS, 
    44         SWITCH_ATTR_CPU_PORT, 
    45         /* attributes */ 
    46         SWITCH_ATTR_OP_ID, 
    47         SWITCH_ATTR_OP_TYPE, 
    48         SWITCH_ATTR_OP_NAME, 
    49         SWITCH_ATTR_OP_PORT, 
    50         SWITCH_ATTR_OP_VLAN, 
    51         SWITCH_ATTR_OP_VALUE_INT, 
    52         SWITCH_ATTR_OP_VALUE_STR, 
    53         SWITCH_ATTR_OP_VALUE_PORTS, 
    54         SWITCH_ATTR_OP_DESCRIPTION, 
    55         /* port lists */ 
    56         SWITCH_ATTR_PORT, 
    57         SWITCH_ATTR_MAX 
    58 }; 
    59  
    60 /* commands */ 
    61 enum { 
    62         SWITCH_CMD_UNSPEC, 
    63         SWITCH_CMD_GET_SWITCH, 
    64         SWITCH_CMD_NEW_ATTR, 
    65         SWITCH_CMD_LIST_GLOBAL, 
    66         SWITCH_CMD_GET_GLOBAL, 
    67         SWITCH_CMD_SET_GLOBAL, 
    68         SWITCH_CMD_LIST_PORT, 
    69         SWITCH_CMD_GET_PORT, 
    70         SWITCH_CMD_SET_PORT, 
    71         SWITCH_CMD_LIST_VLAN, 
    72         SWITCH_CMD_GET_VLAN, 
    73         SWITCH_CMD_SET_VLAN 
    74 }; 
    75  
    76 /* data types */ 
    77 enum switch_val_type { 
    78         SWITCH_TYPE_UNSPEC, 
    79         SWITCH_TYPE_INT, 
    80         SWITCH_TYPE_STRING, 
    81         SWITCH_TYPE_PORTS, 
    82         SWITCH_TYPE_NOVAL, 
    83 }; 
    84  
    85 /* port nested attributes */ 
    86 enum { 
    87         SWITCH_PORT_UNSPEC, 
    88         SWITCH_PORT_ID, 
    89         SWITCH_PORT_FLAG_TAGGED, 
    90         SWITCH_PORT_ATTR_MAX 
    91 }; 
    92  
    93 #define SWITCH_ATTR_DEFAULTS_OFFSET     0x1000 
    94  
    95 #ifdef __KERNEL__ 
     20#include <uapi/linux/switch.h> 
    9621 
    9722struct switch_dev; 
    … …  
    233158}; 
    234159 
    235 #endif 
    236  
    237 #endif 
     160#endif /* _LINUX_SWITCH_H */ 

  • trunk/target/linux/generic/patches-3.7/700-swconfig.patch

    r34247 r34677  
    2828 obj-$(CONFIG_DAVICOM_PHY)      += davicom.o 
    2929 obj-$(CONFIG_CICADA_PHY)       += cicada.o 
     30--- a/include/uapi/linux/Kbuild 
     31+++ b/include/uapi/linux/Kbuild 
     32@@ -355,6 +355,7 @@ header-y += stddef.h 
     33 header-y += string.h 
     34 header-y += suspend_ioctls.h 
     35 header-y += swab.h 
     36+header-y += switch.h 
     37 header-y += synclink.h 
     38 header-y += sysctl.h 
     39 header-y += sysinfo.h 
Note: See TracChangeset for help on using the changeset viewer.