diff options
| author | Florian Fainelli <florian@openwrt.org> | 2013-04-09 15:47:01 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2013-04-09 15:47:01 +0000 |
| commit | 5a27c637056d721ce4fad5bac66af15833844227 (patch) | |
| tree | f0dbe70dbabb6b8c34faab6e2dccf76a567ca139 /target/linux/generic/patches-3.3/a03-swconfig-revert-UAPI-disintegration.patch | |
| parent | 78f6958dea2d97259bfc2ddd70c863477c1e4508 (diff) | |
| download | upstream-5a27c637056d721ce4fad5bac66af15833844227.tar.gz upstream-5a27c637056d721ce4fad5bac66af15833844227.tar.bz2 upstream-5a27c637056d721ce4fad5bac66af15833844227.zip | |
kernel: backport switch user API changes after r36283
3.3 and 3.6 kernels do not make use of the UAPI headers, still they need
to provide an up-to-date switch.h copy for swconfig to build.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36295 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.3/a03-swconfig-revert-UAPI-disintegration.patch')
| -rw-r--r-- | target/linux/generic/patches-3.3/a03-swconfig-revert-UAPI-disintegration.patch | 13 |
1 files changed, 11 insertions, 2 deletions
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 index 569fd0c7b9..a214c15002 100644 --- 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 @@ -1,6 +1,6 @@ --- a/include/linux/switch.h +++ b/include/linux/switch.h -@@ -13,11 +13,86 @@ +@@ -13,11 +13,95 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ @@ -35,6 +35,7 @@ + SWITCH_ATTR_NAME, + SWITCH_ATTR_VLANS, + SWITCH_ATTR_PORTS, ++ SWITCH_ATTR_PORTMAP, + SWITCH_ATTR_CPU_PORT, + /* attributes */ + SWITCH_ATTR_OP_ID, @@ -51,6 +52,14 @@ + SWITCH_ATTR_MAX +}; + ++enum { ++ /* port map */ ++ SWITCH_PORTMAP_PORTS, ++ SWITCH_PORTMAP_SEGMENT, ++ SWITCH_PORTMAP_VIRT, ++ SWITCH_PORTMAP_MAX ++}; ++ +/* commands */ +enum { + SWITCH_CMD_UNSPEC, @@ -90,7 +99,7 @@ struct switch_dev; struct switch_op; -@@ -157,4 +232,6 @@ struct switch_attr { +@@ -164,4 +248,6 @@ struct switch_attr { int max; }; |