aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/base-files/etc/uci-defaults
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2015-02-23 10:35:29 +0000
committerImre Kaloz <kaloz@openwrt.org>2015-02-23 10:35:29 +0000
commite02478a22acc7139571695b553dd1649900c5c4d (patch)
treee444b14b05ad6c91dea0942f65ab30afb69e1f78 /target/linux/mvebu/base-files/etc/uci-defaults
parent0de48a0dd835b71323965261aa47925d29b6a44e (diff)
downloadupstream-e02478a22acc7139571695b553dd1649900c5c4d.tar.gz
upstream-e02478a22acc7139571695b553dd1649900c5c4d.tar.bz2
upstream-e02478a22acc7139571695b553dd1649900c5c4d.zip
mvebu: set default WRT1900AC switch config
This sets 'enable_vlan' and thus uses 802.1q VLANs, but without tagging on either interface. Signed-off-by: Claudio Leite <leitec@staticky.com> Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 44509
Diffstat (limited to 'target/linux/mvebu/base-files/etc/uci-defaults')
-rw-r--r--target/linux/mvebu/base-files/etc/uci-defaults/02_network5
1 files changed, 4 insertions, 1 deletions
diff --git a/target/linux/mvebu/base-files/etc/uci-defaults/02_network b/target/linux/mvebu/base-files/etc/uci-defaults/02_network
index 8b1ed6a789..6485e35059 100644
--- a/target/linux/mvebu/base-files/etc/uci-defaults/02_network
+++ b/target/linux/mvebu/base-files/etc/uci-defaults/02_network
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2014 OpenWrt.org
+# Copyright (C) 2014-2015 OpenWrt.org
#
[ -e /etc/config/network ] && exit 0
@@ -17,6 +17,9 @@ board=$(mvebu_board_name)
case "$board" in
armada-xp-mamba)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
+ ucidef_add_switch "switch0" "1" "1"
+ ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5"
+ ucidef_add_switch_vlan "switch0" "2" "4 6"
;;
*)
kground-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
From a71d6ebfcbc401e520fa4a5aa185d027dfbe5ce1 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Wed, 19 Nov 2014 12:06:38 -0800
Subject: [PATCH 113/170] drm: Put an optional field in the driver struct for
 GEM obj struct size.

This allows a driver to derive from the CMA object without copying all
of the code.

Signed-off-by: Eric Anholt <eric@anholt.net>
---
 drivers/gpu/drm/drm_gem_cma_helper.c | 5 ++++-
 include/drm/drmP.h                   | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

--- a/drivers/gpu/drm/drm_gem_cma_helper.c
+++ b/drivers/gpu/drm/drm_gem_cma_helper.c
@@ -58,8 +58,11 @@ __drm_gem_cma_create(struct drm_device *
 	struct drm_gem_cma_object *cma_obj;
 	struct drm_gem_object *gem_obj;
 	int ret;
+	size_t obj_size = (drm->driver->gem_obj_size ?
+			   drm->driver->gem_obj_size :
+			   sizeof(*cma_obj));
 
-	cma_obj = kzalloc(sizeof(*cma_obj), GFP_KERNEL);
+	cma_obj = kzalloc(obj_size, GFP_KERNEL);
 	if (!cma_obj)
 		return ERR_PTR(-ENOMEM);
 
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -639,6 +639,7 @@ struct drm_driver {
 
 	u32 driver_features;
 	int dev_priv_size;
+	size_t gem_obj_size;
 	const struct drm_ioctl_desc *ioctls;
 	int num_ioctls;
 	const struct file_operations *fops;