aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2011-02-12 16:14:15 +0000
committerJo-Philipp Wich <jow@openwrt.org>2011-02-12 16:14:15 +0000
commitee3a4c2ee9323592534177f9029ac3b4a1f8ca0c (patch)
tree32828ec95c41074106051aee4626d840a7d0b5af /package/base-files
parente08740c7476ad87969b8068b4f4da49f9db946c9 (diff)
downloadupstream-ee3a4c2ee9323592534177f9029ac3b4a1f8ca0c.tar.gz
upstream-ee3a4c2ee9323592534177f9029ac3b4a1f8ca0c.tar.bz2
upstream-ee3a4c2ee9323592534177f9029ac3b4a1f8ca0c.zip
base-file: cleanup ipv6 enabling in unbridge
SVN-Revision: 25473
Diffstat (limited to 'package/base-files')
-rwxr-xr-xpackage/base-files/files/lib/network/config.sh4
1 files changed, 1 insertions, 3 deletions
diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index aa90077ad9..def1562901 100755
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -416,9 +416,7 @@ unbridge() {
for brdev in $(brctl show | awk '$2 ~ /^[0-9].*\./ { print $1 }'); do
brctl delif "$brdev" "$dev" 2>/dev/null >/dev/null
- do_sysctl net.ipv6.conf.$dev.disable_ipv6 0
- [ "${dev##wlan}" != "$dev" ] && \
- do_sysctl net.ipv6.conf.mon.$dev.disable_ipv6 0
+ do_sysctl "net.ipv6.conf.$dev.disable_ipv6" 0
done
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-16 10:51:51 +0000
} /* Name.Class */ .highlight .no { color: #003366; font-weight: bold } /* Name.Constant */ .highlight .nd { color: #555555 } /* Name.Decorator */ .highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */ .highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */ .highlight .nl { color: #336699; font-style: italic } /* Name.Label */ .highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */ .highlight .py { color: #336699; font-weight: bold } /* Name.Property */ .highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */ .highlight .nv { color: #336699 } /* Name.Variable */ .highlight .ow { color: #008800 } /* Operator.Word */ .highlight .w { color: #bbbbbb } /* Text.Whitespace */ .highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */ .highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ .highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ .highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */ .highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-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 63d42755b5ac2fca5d31b5a470470ac68a87b8a8 Mon Sep 17 00:00:00 2001
From: Andy Green <andy@openmoko.com>
Date: Fri, 25 Jul 2008 23:06:15 +0100
Subject: [PATCH] fix-pcf50633-platform-backlight-resume-ramp-setting.patch

Signed-off-by: Andy Green <andy@openmoko.com>
---
 arch/arm/mach-s3c2440/mach-gta02.c |    1 +
 drivers/i2c/chips/pcf50633.c       |    6 ++++--
 include/linux/pcf50633.h           |    1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
index 297b792..309e484 100644
--- a/arch/arm/mach-s3c2440/mach-gta02.c
+++ b/arch/arm/mach-s3c2440/mach-gta02.c
@@ -577,6 +577,7 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
 		},
 	},
 	.defer_resume_backlight = 1,
+	.resume_backlight_ramp_speed = 5
 };
 
 #if 0 /* currently unused */
diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
index bbc8ae6..6745993 100644
--- a/drivers/i2c/chips/pcf50633.c
+++ b/drivers/i2c/chips/pcf50633.c
@@ -2476,10 +2476,12 @@ void pcf50633_backlight_resume(struct pcf50633_data *pcf)
 {
 	dev_info(&pcf->client.dev, "pcf50633_backlight_resume\n");
 
-	/* we force the backlight on in fact */
-	reg_write(pcf, PCF50633_REG_LEDDIM, 1);
+	/* platform defines resume ramp speed */
+	reg_write(pcf, PCF50633_REG_LEDDIM,
+				       pcf->pdata->resume_backlight_ramp_speed);
 	reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.misc[
 				   PCF50633_REG_LEDOUT - PCF50633_REG_AUTOOUT]);
+	/* we force the backlight on in fact */
 	reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.misc[
 			       PCF50633_REG_LEDENA - PCF50633_REG_AUTOOUT] | 1);
 }
diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h
index fa1c7e8..b94b72a 100644
--- a/include/linux/pcf50633.h
+++ b/include/linux/pcf50633.h
@@ -173,6 +173,7 @@ struct pcf50633_platform_data {
 
 	/* post-resume backlight bringup */
 	int defer_resume_backlight;
+	u8 resume_backlight_ramp_speed;
 };
 
 #endif /* _PCF50633_H */
-- 
1.5.6.3