openwrt.git
9 years agonetifd: suppress fw3 warnings in dhcp script
cyrus [Wed, 30 Jul 2014 13:17:56 +0000 (13:17 +0000)]
netifd: suppress fw3 warnings in dhcp script

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41892 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoprocd: update to the latest version, fixes parsing of /etc/openwrt_release
nbd [Wed, 30 Jul 2014 12:39:46 +0000 (12:39 +0000)]
procd: update to the latest version, fixes parsing of /etc/openwrt_release

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41891 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agonetifd: more race condition fixes in proto-shell
cyrus [Tue, 29 Jul 2014 17:24:23 +0000 (17:24 +0000)]
netifd: more race condition fixes in proto-shell

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41887 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agobase-files: properly escape strings for version info
nbd [Tue, 29 Jul 2014 13:30:23 +0000 (13:30 +0000)]
base-files: properly escape strings for version info

Make sure they don't break the sed command, and also make device_info
and openwrt_release more robust for parsing by scripts

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41885 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agobase-files: add extra version configuration options for OEM manufacturer info
nbd [Tue, 29 Jul 2014 13:30:12 +0000 (13:30 +0000)]
base-files: add extra version configuration options for OEM manufacturer info

Creates /etc/device_info which will be used to fill in information for
WPS and other protocols that need manufacturer/device information

This helps with creating OpenWrt firmware for OEM or rebranded devices.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41884 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoppp: fix a buffer overrun in the ms chap code
blogic [Tue, 29 Jul 2014 12:18:52 +0000 (12:18 +0000)]
ppp: fix a buffer overrun in the ms chap code

https://dev.openwrt.org/ticket/17296

Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41882 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agofeeds: disable oldpackages by default
cyrus [Tue, 29 Jul 2014 10:24:12 +0000 (10:24 +0000)]
feeds: disable oldpackages by default

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41875 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoatheros: remove linux 3.8 support
nbd [Tue, 29 Jul 2014 10:23:59 +0000 (10:23 +0000)]
atheros: remove linux 3.8 support

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41874 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agomac80211: support wildcard paths when matching phys
jow [Tue, 29 Jul 2014 09:48:07 +0000 (09:48 +0000)]
mac80211: support wildcard paths when matching phys

This change introduces support for wildcard patterns in "option path"
of section "wifi-device".

Objective is to allow paths like "*/usb[0-9]/*/*" in order to claim
any usb device using the same backend type, regardless of its bus
address or phy name.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41873 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agohostapd: Reintroduce Full Dynamic VLAN support
jow [Tue, 29 Jul 2014 09:48:02 +0000 (09:48 +0000)]
hostapd: Reintroduce Full Dynamic VLAN support

This patch brings full dynamic vlan support to netifd that existed in hostapd.sh in Attitude Adjustment.

Signed-off-by: Joseph CG Walker <Joe@ChubbyPenguin.net>
[jow@openwrt.org: changed commit message, rebased on top of current hostapd.sh]
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41872 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoinclude/toplevel.mk: more chaos calmer renaming
blogic [Tue, 29 Jul 2014 09:10:02 +0000 (09:10 +0000)]
include/toplevel.mk: more chaos calmer renaming

Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41871 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoBB is branched, get ready for Chaos Calmer
kaloz [Tue, 29 Jul 2014 08:24:57 +0000 (08:24 +0000)]
BB is branched, get ready for Chaos Calmer

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41870 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoprocd: work around some docker architecture quirks
cyrus [Tue, 29 Jul 2014 06:51:35 +0000 (06:51 +0000)]
procd: work around some docker architecture quirks

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41867 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoprocd: check output of "uci show" instead of raw config files in order to track uncom...
nbd [Tue, 29 Jul 2014 02:12:24 +0000 (02:12 +0000)]
procd: check output of "uci show" instead of raw config files in order to track uncommitted changes

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41865 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agohostapd: add more missing ifdefs
nbd [Mon, 28 Jul 2014 22:52:39 +0000 (22:52 +0000)]
hostapd: add more missing ifdefs

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41863 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agonetifd: more dynamic interface improvements
cyrus [Mon, 28 Jul 2014 20:35:53 +0000 (20:35 +0000)]
netifd: more dynamic interface improvements

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41862 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agobrcm63xx: replace nvram_buf with a properly initialized array
jogo [Mon, 28 Jul 2014 15:31:37 +0000 (15:31 +0000)]
brcm63xx: replace nvram_buf with a properly initialized array

Use an empty nvram_header to tell wl that there is no nvram buf.
wl else might try to allocate huge amount of memory because the
bcm63xx's nvram does not match the expected structure and contains
random values.

Fixes the following warning on load of wl:

[    9.152000] WARNING: at mm/slab_common.c:377 kmalloc_slab+0x4c/0xc0()
[    9.160000] Modules linked in: wl(P+) wl_glue ipv6 gpio_keys_polled input_polldev button_hotplug input_core
[    9.168000] CPU: 0 PID: 366 Comm: kmodloader Tainted: P             3.10.49 #1
[    9.176000] Stack : 00000000 00000000 00000000 00000000 8034b77a 00000042 81ac9af0 c02e0000
[    9.176000]    8028bf70 802df31b 0000016e 8034af28 81ac9af0 c02e0000 c02e0000 81b39810
[    9.176000]    0000002d 8002c9d4 00000003 8002a3c8 802937a0 c02e0000 8028e528 81ab398c
[    9.176000]    00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
[    9.176000]    00000000 00000000 00000000 00000000 00000000 00000000 00000000 81ab3918
[    9.176000]    ...
[    9.212000] Call Trace:
[    9.216000] [<800224b8>] show_stack+0x48/0x70
[    9.220000] [<8002a538>] warn_slowpath_common+0x78/0xa8
[    9.224000] [<8002a5f0>] warn_slowpath_null+0x18/0x24
[    9.228000] [<8008145c>] kmalloc_slab+0x4c/0xc0
[    9.236000] [<80097258>] __kmalloc+0x20/0x10c
[    9.240000] [<80e23b90>] osl_malloc+0x24/0x6c [wl]
[    9.244000] [<80e15288>] nvram_init+0x54/0x164 [wl]
[    9.252000] [<80e08668>] si_pci_fixcfg+0x60c/0x9e8 [wl]
[    9.256000]
[    9.260000] ---[ end trace b5c4dbb046cf3c83 ]---

Reported-by: Álvaro Fernández Rojas <noltari@gmail.com>
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41861 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agolantiq: fix dgn3500 and td8970 wifi
blogic [Mon, 28 Jul 2014 15:26:41 +0000 (15:26 +0000)]
lantiq: fix dgn3500 and td8970 wifi

ath9k failed to come up due to a bad mac addr

Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41860 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoramips: correct typo ubsphy -> usbphy
blogic [Mon, 28 Jul 2014 15:26:36 +0000 (15:26 +0000)]
ramips: correct typo ubsphy -> usbphy

This appears to be a typo.

Signed-off-by: Russell Senior <russell@personaltelco.net>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41859 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoramips: fix mode switch gpio for AsiaRF AWM eval board
blogic [Mon, 28 Jul 2014 15:26:32 +0000 (15:26 +0000)]
ramips: fix mode switch gpio for AsiaRF AWM eval board

Fix a typo: gpio 21 is already used for the WPS led.  Gpio 20 is the
right one (tested) for the mode switch.  Confirmed that
/sys/kernel/debug/gpio state followed the position of the switch.

Signed-off-by: Russell Senior <russell@personaltelco.net>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41858 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoramips: add ethernet macaddr to dts for AWM003-EVB
blogic [Mon, 28 Jul 2014 15:26:23 +0000 (15:26 +0000)]
ramips: add ethernet macaddr to dts for AWM003-EVB

Follows the pattern of http://patchwork.openwrt.org/patch/5970/

Signed-off-by: Russell Senior <russell@personaltelco.net>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41857 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agobrcm63xx: 3.14: fix ath9k_pci_fixup
jogo [Mon, 28 Jul 2014 11:12:25 +0000 (11:12 +0000)]
brcm63xx: 3.14: fix ath9k_pci_fixup

Since kernel commit 928bea964827 ("PCI: Delay enabling bridges until
they're needed"), pci fixups are run with bridges (e.g. the pcie port)
disabled.

This causses hangs when ath9k_pci_fixup tries to manually enable the
device to apply the register fixups.

Fix this by enabling any parent bridges before trying to access the
device itself.

Fixes boot on DSL-274XB rev F1.

Reported-by: Matteo Croce <matteo@openwrt.org>
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41856 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agohostapd: add missing ifdef
nbd [Mon, 28 Jul 2014 10:36:51 +0000 (10:36 +0000)]
hostapd: add missing ifdef

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41855 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agolantiq: fix dgn3500 ethernet
blogic [Mon, 28 Jul 2014 08:06:40 +0000 (08:06 +0000)]
lantiq: fix dgn3500 ethernet

Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41854 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agobrcm63xx: Add support for ADB P.DG A4001N
jogo [Sun, 27 Jul 2014 17:44:59 +0000 (17:44 +0000)]
brcm63xx: Add support for ADB P.DG A4001N

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41852 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agobrcm63xx: Add support for Huawei HG520v
jogo [Sun, 27 Jul 2014 17:44:56 +0000 (17:44 +0000)]
brcm63xx: Add support for Huawei HG520v

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41851 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agobrcm63xx: Add support for ZyXEL P870HW-51a v2
jogo [Sun, 27 Jul 2014 17:44:53 +0000 (17:44 +0000)]
brcm63xx: Add support for ZyXEL P870HW-51a v2

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41850 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agofirmware-utils: add new tool for fixing headers on ZyXEL devices (brcm63xx)
jogo [Sun, 27 Jul 2014 17:44:51 +0000 (17:44 +0000)]
firmware-utils: add new tool for fixing headers on ZyXEL devices (brcm63xx)

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41849 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agobrcm63xx: Add support for Comtrend VR-3025un
jogo [Sun, 27 Jul 2014 17:44:48 +0000 (17:44 +0000)]
brcm63xx: Add support for Comtrend VR-3025un

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Signed-off-by: José Vázquez Fernández <ppvazquezfer@gmail.com>
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41848 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agobrcm63xx: Add support for Comtrend VR-3025u
jogo [Sun, 27 Jul 2014 17:44:45 +0000 (17:44 +0000)]
brcm63xx: Add support for Comtrend VR-3025u

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Signed-off-by: José Vázquez Fernández <ppvazquezfer@gmail.com>
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41847 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoocteon: enable usb and gpio
blogic [Sun, 27 Jul 2014 14:52:18 +0000 (14:52 +0000)]
octeon: enable usb and gpio

Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41846 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoocteon: add gpio driver
blogic [Sun, 27 Jul 2014 14:52:12 +0000 (14:52 +0000)]
octeon: add gpio driver

Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41845 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoocteon: add detection for edgerouter and edgerouter-pro
blogic [Sun, 27 Jul 2014 14:52:07 +0000 (14:52 +0000)]
octeon: add detection for edgerouter and edgerouter-pro

Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41844 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoocteon: select gcc 4.6 by default
blogic [Sun, 27 Jul 2014 14:52:00 +0000 (14:52 +0000)]
octeon: select gcc 4.6 by default

Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41843 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoocteon: fix usb support on edge router pro
blogic [Sat, 26 Jul 2014 20:36:32 +0000 (20:36 +0000)]
octeon: fix usb support on edge router pro

Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41842 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoramips: add support for Kingston MLW221
blogic [Sat, 26 Jul 2014 20:36:22 +0000 (20:36 +0000)]
ramips: add support for Kingston MLW221

This patch adds support for the Kingston Mobilelite Wireless (MLW-221)

http://wiki.openwrt.org/toh/kingston/mlw221

Signed-off-by: L. D. Pinney <ldpinney@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41841 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agobase-files: Remove stale calls to start() in initscripts.
blogic [Sat, 26 Jul 2014 20:36:15 +0000 (20:36 +0000)]
base-files: Remove stale calls to start() in initscripts.

based on http://patchwork.openwrt.org/patch/5969/

Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41840 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoramips: ethernet mac cleanup
blogic [Sat, 26 Jul 2014 20:36:09 +0000 (20:36 +0000)]
ramips: ethernet mac cleanup

Compile tested all subtargets and profiles.
Unfortunately I don't own any board affected by these changes, so no run tests.

Signed-off-by: Roman Yeryomin <roman@advem.lv>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41839 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoramips: fix vlan configuration for asiarf avm003
blogic [Sat, 26 Jul 2014 20:36:01 +0000 (20:36 +0000)]
ramips: fix vlan configuration for asiarf avm003

The earlier r41797 change was missing this part, to enable the right
vlan configuration.

Signed-off-by: Russell Senior <russell@personaltelco.net>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41838 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoramips: fix sysupgrade for asiarf awm003
blogic [Sat, 26 Jul 2014 20:35:46 +0000 (20:35 +0000)]
ramips: fix sysupgrade for asiarf awm003

Since the earlier r41797 change, the board_name for awm003 has been
miscalculated, and sysupgrade has been broken.  This seems to fix it.

Signed-off-by: Russell Senior <russell@personaltelco.net>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41837 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agonetifd: fix a small issue in r41831
nbd [Sat, 26 Jul 2014 14:35:15 +0000 (14:35 +0000)]
netifd: fix a small issue in r41831

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41836 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agobrcm47xx: don't create named switch_vlan sections
hauke [Sat, 26 Jul 2014 12:33:48 +0000 (12:33 +0000)]
brcm47xx: don't create named switch_vlan sections

It doesn't seem to be used anywhere, it's incompatible with other
targets and can be confusing. People may think they need to update
section name every time they change VLAN ID (well, even I was doing
that).

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41835 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agokernel: remove kernel 3.6
hauke [Sat, 26 Jul 2014 12:23:56 +0000 (12:23 +0000)]
kernel: remove kernel 3.6

kernel 3.6 is not used by any target any more, remove it.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41834 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoodhcp6c: suppress fw3 warnings
nbd [Sat, 26 Jul 2014 12:23:28 +0000 (12:23 +0000)]
odhcp6c: suppress fw3 warnings

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41833 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agopackages: remove empty directories
hauke [Sat, 26 Jul 2014 12:18:11 +0000 (12:18 +0000)]
packages: remove empty directories

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41832 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agonetifd: update to the latest version, fixes a race condition with renew/setup
nbd [Sat, 26 Jul 2014 01:46:34 +0000 (01:46 +0000)]
netifd: update to the latest version, fixes a race condition with renew/setup

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41831 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoiwinfo: avoid creating tmp.* ifaces for scanning
jow [Fri, 25 Jul 2014 15:52:17 +0000 (15:52 +0000)]
iwinfo: avoid creating tmp.* ifaces for scanning

If the iface to scan on already is in ad-hoc, station or monitor mode
then do not spawn a temporary iface.

Also preventively disable IPv6 on temporary ifaces before bringing them
up to avoid potential security issues.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41830 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoiwinfo: fix secondary radios being misreported as ralink device
jow [Fri, 25 Jul 2014 14:36:43 +0000 (14:36 +0000)]
iwinfo: fix secondary radios being misreported as ralink device

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41829 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agohostapd: prevent spurious 20/40 mhz channel bandwidth switches if noscan is enabled
nbd [Fri, 25 Jul 2014 14:29:58 +0000 (14:29 +0000)]
hostapd: prevent spurious 20/40 mhz channel bandwidth switches if noscan is enabled

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41828 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agomac80211: merge a few WDS-AP related fixes (#14756, #16802)
nbd [Fri, 25 Jul 2014 14:24:03 +0000 (14:24 +0000)]
mac80211: merge a few WDS-AP related fixes (#14756, #16802)

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41827 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoiwinfo: continue scanning even if temporary mac cannot be changed
jow [Fri, 25 Jul 2014 14:11:50 +0000 (14:11 +0000)]
iwinfo: continue scanning even if temporary mac cannot be changed

So far iwinfo aborted a wifi scan attempt if the mac of the spawned
interface could not be changed. Change the code to try anyway - this
should fix wifi scanning on RaLink devices.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41826 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agonetifd: Fix some race-conditions in interface handling
cyrus [Thu, 24 Jul 2014 22:05:19 +0000 (22:05 +0000)]
netifd: Fix some race-conditions in interface handling

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41825 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoimagebuilder: fix typo that copied grub to the wrong folder
blogic [Thu, 24 Jul 2014 15:46:12 +0000 (15:46 +0000)]
imagebuilder: fix typo that copied grub to the wrong folder

Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41824 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agosoftwires: redesign dhcp(v6) provisioning
cyrus [Thu, 24 Jul 2014 14:17:41 +0000 (14:17 +0000)]
softwires: redesign dhcp(v6) provisioning

Signed-off-by: Steven Barth <steven@midlink.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41823 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years ago[mac80211]: package the mwifiex-pcie driver
kaloz [Thu, 24 Jul 2014 10:18:06 +0000 (10:18 +0000)]
[mac80211]: package the mwifiex-pcie driver

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41820 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agokernel: annotate bridge multicast backport patch with upstream commits
nbd [Thu, 24 Jul 2014 09:19:37 +0000 (09:19 +0000)]
kernel: annotate bridge multicast backport patch with upstream commits

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41819 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agonetifd: update to the latest version, enables bridge multicast querier and fixes...
nbd [Thu, 24 Jul 2014 09:13:04 +0000 (09:13 +0000)]
netifd: update to the latest version, enables bridge multicast querier and fixes interface reload issues with wifi

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41818 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agokernel: backport upstream bridge multicast snooping fixes
nbd [Thu, 24 Jul 2014 09:12:59 +0000 (09:12 +0000)]
kernel: backport upstream bridge multicast snooping fixes

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41817 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoodhcpd: don't lose downstream routes for managed PD
cyrus [Wed, 23 Jul 2014 21:14:56 +0000 (21:14 +0000)]
odhcpd: don't lose downstream routes for managed PD

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41816 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoath9k: fix a long standing aggregation related tx lockup
nbd [Wed, 23 Jul 2014 13:44:44 +0000 (13:44 +0000)]
ath9k: fix a long standing aggregation related tx lockup

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41815 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years ago[ar71xx]: add support for the archer c5
kaloz [Wed, 23 Jul 2014 12:47:25 +0000 (12:47 +0000)]
[ar71xx]: add support for the archer c5

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41814 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years ago[ar71xx]: refresh patches
kaloz [Wed, 23 Jul 2014 11:46:42 +0000 (11:46 +0000)]
[ar71xx]: refresh patches

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41812 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoramips: fix gpio mapping on MZK-750DHP
blogic [Wed, 23 Jul 2014 07:49:54 +0000 (07:49 +0000)]
ramips: fix gpio mapping on MZK-750DHP

Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41811 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoramips: fix missing inclusion of system.sh for mtd_get_mac_binary and friends.
blogic [Wed, 23 Jul 2014 07:49:50 +0000 (07:49 +0000)]
ramips: fix missing inclusion of system.sh for mtd_get_mac_binary and friends.

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41810 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoar71xx: fix LED configuration for HiWiFi-HC6361.
blogic [Wed, 23 Jul 2014 07:46:07 +0000 (07:46 +0000)]
ar71xx: fix LED configuration for HiWiFi-HC6361.

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41809 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoodhcpd: revert NDP relay rewrite (performance issue still fixed)
cyrus [Tue, 22 Jul 2014 21:52:20 +0000 (21:52 +0000)]
odhcpd: revert NDP relay rewrite (performance issue still fixed)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41808 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agomac80211: b43: update b43 to version master-2014-07-22
hauke [Tue, 22 Jul 2014 21:42:07 +0000 (21:42 +0000)]
mac80211: b43: update b43 to version master-2014-07-22

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41805 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agokernel: update bcma and ssb to version master-2014-07-22
hauke [Tue, 22 Jul 2014 21:40:41 +0000 (21:40 +0000)]
kernel: update bcma and ssb to version master-2014-07-22

This is a backport of bcma and ssb from wireless-tesing/master tag
master-2014-07-22.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41804 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agomac80211: fix a null pointer deref when querying station info when rate control is...
nbd [Tue, 22 Jul 2014 19:05:19 +0000 (19:05 +0000)]
mac80211: fix a null pointer deref when querying station info when rate control is not initialized (#17061)

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41801 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoramips: add a profile for AWM003
blogic [Tue, 22 Jul 2014 09:58:21 +0000 (09:58 +0000)]
ramips: add a profile for AWM003

same as AWM002 but with 64mb RAM

Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41797 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoodhcpd: fix typo in ubus integration (thanks Markus Stenberg)
cyrus [Mon, 21 Jul 2014 21:57:15 +0000 (21:57 +0000)]
odhcpd: fix typo in ubus integration (thanks Markus Stenberg)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41796 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoar71xx: fix WAN MAC setup on dir-825-c1
blogic [Mon, 21 Jul 2014 19:26:54 +0000 (19:26 +0000)]
ar71xx: fix WAN MAC setup on dir-825-c1

Changeset 38690 broke the WAN MAC setup. Here's the fix.

Signed-off-by: Sebastian Kemper <sebastian_ml <at> gmx.net>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41795 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoar71xx: Register reset button on UBNT AirGW
blogic [Mon, 21 Jul 2014 19:26:50 +0000 (19:26 +0000)]
ar71xx: Register reset button on UBNT AirGW

The airGateway has a reset button connected to GPIO 12, so we should use it.

Signed-off-by: Matthew Reeve <mreeve@tenxnetworks.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41794 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoar71xx: Fix GL.iNet WLAN LED
blogic [Mon, 21 Jul 2014 19:26:46 +0000 (19:26 +0000)]
ar71xx: Fix GL.iNet WLAN LED

LED script expects WLAN LED to be "gl-connect:red:wlan".

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41793 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agotarget/linux/*/image/Makefile: eliminate more LINUX_DIR users
blogic [Mon, 21 Jul 2014 18:42:11 +0000 (18:42 +0000)]
target/linux/*/image/Makefile: eliminate more LINUX_DIR users

Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41792 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agotarget/linux/*/image/Makefile: use new dts path variable
blogic [Mon, 21 Jul 2014 18:42:06 +0000 (18:42 +0000)]
target/linux/*/image/Makefile: use new dts path variable

Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41791 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoimagebuilder: copy dts folder
blogic [Mon, 21 Jul 2014 18:42:00 +0000 (18:42 +0000)]
imagebuilder: copy dts folder

Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41790 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoinclude/image.mk: add a path variable for the dts folder
blogic [Mon, 21 Jul 2014 18:41:56 +0000 (18:41 +0000)]
include/image.mk: add a path variable for the dts folder

Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41789 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoar71xx: split wndr4300 and wndr3700v4 into 2 seperate mips machines
blogic [Mon, 21 Jul 2014 18:41:52 +0000 (18:41 +0000)]
ar71xx: split wndr4300 and wndr3700v4 into 2 seperate mips machines

Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41788 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agolantiq-dsl: add 2 ugly workarounds for the IB to work
blogic [Mon, 21 Jul 2014 18:41:46 +0000 (18:41 +0000)]
lantiq-dsl: add 2 ugly workarounds for the IB to work

the IB tries to run the enable target on all init.d scripts.
It fails when including the dsl_control helper. Check for existence
prior to the include.

Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41787 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoodhcp6c: Send RS with source link-layer address if possible
cyrus [Mon, 21 Jul 2014 10:11:09 +0000 (10:11 +0000)]
odhcp6c: Send RS with source link-layer address if possible

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41778 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agokernel: refresh 3.10 patches
blogic [Sun, 20 Jul 2014 17:31:15 +0000 (17:31 +0000)]
kernel: refresh 3.10 patches

Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41777 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agokernel: update to 3.10.49
blogic [Sun, 20 Jul 2014 17:31:11 +0000 (17:31 +0000)]
kernel: update to 3.10.49
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41776 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoar71xx: create profile and build image for the OpenMesh OM5P board
blogic [Sun, 20 Jul 2014 17:31:05 +0000 (17:31 +0000)]
ar71xx: create profile and build image for the OpenMesh OM5P board

Signed-off-by: Marek Lindner <marek@open-mesh.com>
[sven@open-mesh.com: Rebased]
Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41775 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agopackage/uboot-envtools: add OpenMesh OM5P support
blogic [Sun, 20 Jul 2014 17:31:00 +0000 (17:31 +0000)]
package/uboot-envtools: add OpenMesh OM5P support

Signed-off-by: Marek Lindner <marek@open-mesh.com>
[sven@open-mesh.com: Rebased]
Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41774 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agopackage/om-watchdog: add OpenMesh OM5P support
blogic [Sun, 20 Jul 2014 17:30:56 +0000 (17:30 +0000)]
package/om-watchdog: add OpenMesh OM5P support

Signed-off-by: Marek Lindner <marek@open-mesh.com>
[sven@open-mesh.com: Rebased]
Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41773 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoar71xx: enable sysupgrade for the OpenMesh OM5P
blogic [Sun, 20 Jul 2014 17:30:52 +0000 (17:30 +0000)]
ar71xx: enable sysupgrade for the OpenMesh OM5P

Signed-off-by: Marek Lindner <marek@open-mesh.com>
[sven@open-mesh.com: Rebased]
Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41772 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoscripts/om-fwupgradecfg-gen.sh: add support for the OM5P
blogic [Sun, 20 Jul 2014 17:30:48 +0000 (17:30 +0000)]
scripts/om-fwupgradecfg-gen.sh: add support for the OM5P

Signed-off-by: Marek Lindner <marek@open-mesh.com>
[sven@open-mesh.com: Rebased]
Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41771 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoar71xx: add user-space support for the OpenMesh OM5P
blogic [Sun, 20 Jul 2014 17:30:44 +0000 (17:30 +0000)]
ar71xx: add user-space support for the OpenMesh OM5P

Signed-off-by: Marek Lindner <marek@open-mesh.com>
[sven@open-mesh.com: Rebased]
Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41770 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoar71xx: add kernel support for the OpenMesh OM5P board
blogic [Sun, 20 Jul 2014 17:30:32 +0000 (17:30 +0000)]
ar71xx: add kernel support for the OpenMesh OM5P board

Signed-off-by: Marek Lindner <marek@open-mesh.com>
[sven@open-mesh.com: Rebased]
Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41769 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoramips: fix mac address partitions on ASL-26555
blogic [Sun, 20 Jul 2014 17:30:28 +0000 (17:30 +0000)]
ramips: fix mac address partitions on ASL-26555

ASL-26555 16MB: caldata is present on uboot-env and devdata, but the proper one seems to be the devdata, since mac address corresponds to Amper, the real manufacturer, meanwhile the caldata on  uboot-env corresponds to D-Link.
ASL-26555 8MB: caldata is only present on uboot-env, but its mac address corresponds to Alpha, the real manufacturer.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41768 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoar71xx: add RB91x boards to uci-defaults 02_network
blogic [Sun, 20 Jul 2014 17:30:24 +0000 (17:30 +0000)]
ar71xx: add RB91x boards to uci-defaults 02_network

The default case in 02_network is inappropriate for the MikroTik RouterBOARD 91x boards because they do not have a WAN port, so don't bother setting the non-existent eth1 interface as the WAN port.

Signed-off-by: Matthew Reeve <mreeve@tenxnetworks.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41767 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoar71xx: Add UBNT airGateway support
blogic [Sun, 20 Jul 2014 17:30:17 +0000 (17:30 +0000)]
ar71xx: Add UBNT airGateway support

This patch adds support for the Ubiquiti Networks airGateway.

Based in part on code posted by David Hutchison <dhutchison@bluemesh.net> on openwrt-devel:
  https://lists.openwrt.org/pipermail/openwrt-devel/2013-December/023035.html

Signed-off-by: Matthew Reeve <mreeve@tenxnetworks.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41766 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agoorion: Update kernel to 3.10.44
hauke [Sun, 20 Jul 2014 09:42:14 +0000 (09:42 +0000)]
orion: Update kernel to 3.10.44

Update the kernel of the orion target to version 3.10.44.
Refresh orion config and patches to match the changes in the kernel

Tested on WRT350N-v2 device.

Signed-off-by: Maarten Bezemer <maarten.bezemer@gmail.com>
[run make kernel_oldconfig, fold a01-dt2-fixes-for-3.3.patch into dt2-setup.c,
 make dt2-setup.c compile, fix harddisk subprofile]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41765 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agox86: add back a line accidentally removed in r41763
nbd [Sun, 20 Jul 2014 08:20:14 +0000 (08:20 +0000)]
x86: add back a line accidentally removed in r41763

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41764 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agox86: remove the arbitrary limitation of vmware/virtualbox images to ext4, select...
nbd [Sun, 20 Jul 2014 08:18:50 +0000 (08:18 +0000)]
x86: remove the arbitrary limitation of vmware/virtualbox images to ext4, select TARGET_IMAGES_PAD instead

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41763 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years ago[mac80211]: fix typo
kaloz [Sat, 19 Jul 2014 20:14:49 +0000 (20:14 +0000)]
[mac80211]: fix typo

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41762 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agousbmode: update to latest git and also update the device database
blogic [Sat, 19 Jul 2014 16:57:09 +0000 (16:57 +0000)]
usbmode: update to latest git and also update the device database

Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41761 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years agofirewall: implement support for abritary netmasks
jow [Sat, 19 Jul 2014 16:30:47 +0000 (16:30 +0000)]
firewall: implement support for abritary netmasks

Properly parse and pass arbritary netmasks to iptables, this allows
specifying ranges like '::c23f:eff:fe7a:a094/::ffff:ffff:ffff:ffff' to
match the host part of an IPv6 address regardless of the currently active
IPv6 prefix.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41760 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 years ago[ar71xx]: extract and fixup the board.bin on the archer
kaloz [Sat, 19 Jul 2014 13:20:14 +0000 (13:20 +0000)]
[ar71xx]: extract and fixup the board.bin on the archer

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41757 3c298f89-4303-0410-b956-a3cf2f4a3e73