aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/files
Commit message (Collapse)AuthorAgeFilesLines
* ar71xx: remove the use of the obsolete IRQF_DISABLED flag in the NAND flash ↵Felix Fietkau2015-07-201-1/+1
| | | | | | | | driver (fixes #20125) Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46433 3c298f89-4303-0410-b956-a3cf2f4a3e73
* Revert "ar71xx: Add support for Cisco-Linksys WAP4410N" (r46250)Felix Fietkau2015-07-191-285/+0
| | | | | | | | The commit is incomplete, it does not even build the mach-* file This reverts commit 6e6adcf7a197b1802cb728ddcccf05f890ca0574 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46425 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: add support for the devolo dLAN pro 1200+ WiFi acJohn Crispin2015-07-141-0/+189
| | | | | | Signed-off-by: Günther Kelleter <guenther.kelleter@devolo.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46342 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: add support for the devolo dLAN pro 500 Wireless+John Crispin2015-07-141-0/+203
| | | | | | Signed-off-by: Günther Kelleter <guenther.kelleter@devolo.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46338 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: compex wpe72 add space to include statementJohn Crispin2015-07-091-1/+1
| | | | | | Signed-off-by: Christian Mehlis <christian@m3hlis.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46284 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: compex wpj531 register usb supportJohn Crispin2015-07-091-0/+1
| | | | | | Signed-off-by: Christian Mehlis <christian@m3hlis.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46283 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: compex wpj531 fix setting mac address on ethernetJohn Crispin2015-07-091-6/+5
| | | | | | Signed-off-by: Christian Mehlis <christian@m3hlis.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46282 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: compex wpj531 fix ethernet registrationJohn Crispin2015-07-091-2/+2
| | | | | | | | | | | In fb6f62e97733312053ab593fcf68eea47a21169e several settings are set on the ethernet device, but they are not working. Fix Ethernet by setting the right values. Signed-off-by: Christian Mehlis <christian@m3hlis.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46281 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: ag71xx remove IRQF_DISABLEDJohn Crispin2015-07-091-1/+1
| | | | | | | | | | no-op since 2.6.35 removed in Kernel 4.1 see https://lwn.net/Articles/380931/ Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46280 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: Add support for Cisco-Linksys WAP4410NJohn Crispin2015-07-071-0/+285
| | | | | | | | | | This patch adds support for the Cisco WAP4410N, an access point that uses the AR9132 SoC. Web upgrades from stock are not yet possible, UART access required for the initial flash. Signed-off-by: Ryan A Young <rayoung@utexas.edu> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46250 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: add support for D-Link DIR-615 rev. Ix boardJohn Crispin2015-07-071-0/+133
| | | | | | | | Based on trunk r46212. Signed-off-by: Jaehoon You <teslamint@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46248 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: Use *_eth_cfg helper for Open Mesh MR900 boardsJohn Crispin2015-07-071-20/+1
| | | | | | Signed-off-by: Sven Eckelmann <sven@open-mesh.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46241 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: Add Support for the Bitmain Antminer S3John Crispin2015-07-071-0/+98
| | | | | | | | | | This patch adds support for the Bitmain Antminer S3 Cryptocurrency Miner http://wiki.openwrt.org/toh/bitmain/s3 Signed-off-by: L. D. Pinney <ldpinney@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46236 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: allow pci calibration fixup to work with ar9344John Crispin2015-07-071-0/+3
| | | | | | Signed-off-by: Alexander Couzens <lynxis@fe80.eu> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46235 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: add support for ap143Felix Fietkau2015-07-071-0/+142
| | | | | | Signed-off-by: Miaoqing Pan <miaoqing@codeaurora.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46208 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: rework patch for qca953x/956xFelix Fietkau2015-07-071-2/+16
| | | | | | | | | | | | | | | | | | | Patch cherry-picked from the following location: https://www.codeaurora.org/cgit/quic/qsdk/oss/system/openwrt/commit/?h=release/coconut_ioe4531_2.0&id=5c357bf6c763e4140dddcc9a3bc5f005525a9c0e Changelist, - add more register defines - add EHCI support - fix GPIO pin count to 18 - fix chained irq disabled - fix GMAC0/GMAC1 initial - fix WMAC irq number to 47 - merge the changes of dev-eth.c from the patch to file. Signed-off-by: Miaoqing Pan <miaoqing@codeaurora.org> Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46207 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: fix ethernet initialization on QCA953x-based boards (TP-Link ↵Felix Fietkau2015-07-072-0/+13
| | | | | | | | | | | | TL-WR841N/ND v9, Compex WPJ531) The initialization routines for these boards were relying on some (wrong) defaults for the QCA953x ethernet. Make these defaults explicit to prevent breaking them when the QCA953x defaults are fixed. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46206 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: add kernel support for EnGenius EPG5000.John Crispin2015-06-181-0/+178
| | | | | | Signed-off-by: Christian Beier <cb@shoutrlabs.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46047 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: add support for TL-WR720N-v4.John Crispin2015-06-181-2/+1
| | | | | | | | | | The hardware should be almost the same as TL-WR720N-v3. WiFi and LAN networks were tested by "Lo Yuk Fai <loyukfai@gmail.com>". Failsafe and slider switch were tested by "Wong min <alpha080@gmail.com>". Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46046 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: add support for compex wpj531John Crispin2015-06-181-0/+136
| | | | | | | | | | | tftpboot 0x80500000 openwrt-ar71xx-generic-wpj531-16M-squashfs-sysupgrade.bin erase 0x9f030000 +$filesize erase 0x9f680000 +1 cp.b $fileaddr 0x9f030000 $filesize Signed-off-by: Christian Mehlis <christian@m3hlis.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46045 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: Add Support for the Bitmain Antminer S1John Crispin2015-06-181-0/+98
| | | | | | | | | | | This patch adds support for the Bitmain Antminer S1 Cryptocurrency Miner http://wiki.openwrt.org/toh/bitmain/s1 Signed-off-by: L. D. Pinney <ldpinney@gmail.com> Acked-by: James Hilliard <james.hilliard1@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46044 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: ar934x-nfc: allow ECC to be configured in software BCH modeFelix Fietkau2015-06-182-0/+5
| | | | | | | | | Some devices ship with NAND images that use BCH ECC. Let the driver know about that ECC mode so that it can be selected by machine files. Signed-off-by: Thomas Hebb <tommyhebb@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46022 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: return limit as number of processed frames when re-scheduling NAPI pollFelix Fietkau2015-06-141-1/+1
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45971 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar8216: Fix problem with AR8337 MAC swap handlingFelix Fietkau2015-06-144-0/+4
| | | | | | | | | | | | | | | | | | | | | AR8337 supports a configuration bit to swap MAC0 and MAC6. Currently this is set in general if an AR8337 is detected and causes issues with devices using an AR8334 (internally an AR8337, just less chip pins). And it might even cause issues with AR8337-based devices with different board designs. Swapping the MAC's however isn't needed for AR8337 in general. It's just needed in case of certain board designs (affected devices seem to be based on Atheros reference board AP135/136-010). Therefore this configuration bit should be moved to platform data. The patch includes the needed changes to the device initialization code of affected devices. Hopefully I didn't miss any .. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45970 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: fix 100/10mbps ethernet link issues on mynet range extenderFelix Fietkau2015-06-141-0/+20
| | | | | | | | | | | | | | | | | | The mynet range extender hardware is suffering from ethernet link loss when booting with a recent openwrt image. This only happens on 100mbps links, with 1Gbps speed the link was fine. The cause of the problem is that the AR8035 PHY (aka F1E) requires turning on and off the special TX delay setting depending on the speed of the link. The 10mbps mode only needed the proper pll value, which was extracted from the vendor code. Reported-by: Pascal Paradis Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45954 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: Add support for the Meraki MR12 & MR16John Crispin2015-05-232-0/+233
| | | | | | | | | | This patch is to add support for the Meraki MR12 and MR16 Access Points. Currently everything is working, minus the 2nd NIC interface on the MR12 which is built into the SoC. Signed-off-by: Chris R Blake <chrisrblake93 at gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45726 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: add status led found on ew-dorin boardsLuka Perkov2015-05-101-1/+7
| | | | | | Signed-off-by: Catrinel Catrinescu <cc@80211.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45656 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: do general formatting on wnr2000-v4Felix Fietkau2015-05-081-43/+52
| | | | | | Signed-off-by: Michael J. Bazzinotti <mbazzinotti@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45640 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: fix spelling, add copyright on wnr2000-v4Felix Fietkau2015-05-081-2/+3
| | | | | | Signed-off-by: Michael J. Bazzinotti <mbazzinotti@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45639 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: add support for Green WAN LED on wnr2000-v4Felix Fietkau2015-05-081-0/+4
| | | | | | Signed-off-by: Michael J. Bazzinotti <mbazzinotti@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45638 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: add support for green LAN LEDS for wnr2000-v4Felix Fietkau2015-05-081-8/+40
| | | | | | Signed-off-by: Michael J. Bazzinotti <mbazzinotti@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45637 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: fix amber WAN LED setting for wnr2000-v4Felix Fietkau2015-05-081-1/+1
| | | | | | Signed-off-by: Michael J. Bazzinotti <mbazzinotti@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45636 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: make WLAN button RFKILL on wnr2000-v4Felix Fietkau2015-05-081-1/+1
| | | | | | | | | Users will now be provided with the inherent wifi toggle functionality of /etc/rc.button/rfkill Signed-off-by: Michael J. Bazzinotti <mbazzinotti@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45635 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: set all buttons to be active_low on wnr2000-v4Felix Fietkau2015-05-081-0/+3
| | | | | | | | | Originally pressing a button would trigger a release state and vice-versa, as observed from hotplug.d. Signed-off-by: Michael J. Bazzinotti <mbazzinotti@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45634 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: fix ethernet on wnr2000-v4Felix Fietkau2015-05-081-22/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Most people report broken ethernet with upstream. Last year, user "franz.flasch" authored a working mach-file. His patch is outdated so I modernized it. Original patch and user commentary on page 1: https://forum.openwrt.org/viewtopic.php?pid=260861#p260861 I have figured out what the critical differences are between the two that caused upstream ethernet to break. 1) Both ath79_init_mac() functions calls must be invocated before any GMAC init 2) must init GMAC0 before GMAC1 That was enough to get upstream to function, but I wanted to enjoy my confidence having tested franz's patch for a week sucessfully, so I put his whole function in, which only features more differences in order of function calls. An expert should consider these changes, which could pose potential bugs/issues: 1) No longer using the flag AR934X_ETH_CFG_SW_PHY_SWAP in the ath79_setup_ar934x_eth_cfg() call. 2) Possible consequence of no longer explicitly setting ethernet duplex/speed. Review: With this patch, my ethernet and wireless works. Signed-off-by: Michael J. Bazzinotti <mbazzinotti@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45633 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: use a common naming scheme for LEDS on wnr2000-v4Felix Fietkau2015-05-081-9/+9
| | | | | | | | | It is common that the router provider be used rather than product name. One can see this in target/linux/ar71xx/base-files/etc/uci-defaults/01_leds Signed-off-by: Michael J. Bazzinotti <mbazzinotti@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45630 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: fix leds and gpio on wpj344Luka Perkov2015-04-291-15/+13
| | | | | | Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45589 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: add support for compex wpj344Luka Perkov2015-04-201-0/+177
| | | | | | | Signed-off-by: Christian Mehlis <christian@m3hlis.de> Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45527 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: Increase RXD/RDV to 2 on OM5P-ANFelix Fietkau2015-04-201-3/+2
| | | | | | | | | | It was reported that OM5P-AN needs not only a delay setting of 1 for RXD/RDV but 2. These was found when testing with a NetGear GS752TP POE switch with a cable length of 50ft and 250ft. Signed-off-by: Sven Eckelmann <sven@open-mesh.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45524 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: add a helper function to set RXDV/RXD of ETH_CFG on AR934xFelix Fietkau2015-04-202-0/+27
| | | | | | | | | | | | | | | The ETH_RXDV_DELAY (17:16) and ETH_RXD_DELAY (15:14) are currently not cleared by the function ath79_setup_ar934x_eth_cfg. Clearing these in the ath79_setup_ar934x_eth_cfg may cause problems on some hardware because they rely on the preset value by the bootloader. Instead another function is introduced which also works on ETH_CFG on AR934x. It can be used to safely clear and set ETH_RXDV_DELAY and ETH_RXD_DELAY on machines which require special settings. Signed-off-by: Sven Eckelmann <sven@open-mesh.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45523 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: Remove TX/RX delay from pll_1000 for OM5P-ANFelix Fietkau2015-04-201-1/+1
| | | | | | | | | | The tx/rx delay bits in the ETH_XMII_CONTROL register have to be unset when the enable_rgmii_rx_delay/enable_rgmii_tx_delay will be set in the AT803x PHY. Othwise the throughput in gigabit mode is heavily reduced. Signed-off-by: Sven Eckelmann <sven@open-mesh.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45521 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: fix ethernet packet loss issues on OM5P-ANJohn Crispin2015-04-141-1/+21
| | | | | | | | | | | | | | | The OM5P-AN boards are suffering from ethernet packet loss when booting with some active POE setups or when switching to Fast Ethernet when previously booted with Gigabit ethernet attached. The cause of the problem is that the AR8035 PHYs requires special register settings to work reliably on these boards. Enable the RGMII TX, RX delays and disable SmartEE functionality of the AR8035 PHYs. Also enable the RXD and RDV delay in the ETH_CFG register to fix the issue. Signed-off-by: Sven Eckelmann <sven@open-mesh.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45438 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: add initial support for RB911G-5HPacDGabor Juhos2015-04-071-0/+236
| | | | | | Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45299 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: routerboot: export extended wlan data via sysfsGabor Juhos2015-04-071-0/+58
| | | | | | | | Export the data to make it accessible from user-space. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45298 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: routerboot: add support for extended radio dataGabor Juhos2015-04-072-7/+64
| | | | | | | | | | | | | On newer Mikrotik boards, the radio calibration data is stored differently and uses LZO compression instead of RLE. Update the RouterBOOT helper code to support the new format. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45297 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: add kernel support for the OpenMesh OM5P-AN boardJohn Crispin2015-03-171-0/+77
| | | | | | Signed-off-by: Sven Eckelmann <sven@open-mesh.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44861 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: fix TP-LINK TL-WDR3600/4300 RFKILL switch positionsJohn Crispin2015-03-151-0/+1
| | | | | | | | | | While the switch positions aren't explicitly labeled as on and off, we've heard complaints about them being wrong. This patch changes the handling to match the stock firmware. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44795 3c298f89-4303-0410-b956-a3cf2f4a3e73
* Fix (invert/revert) Hornet-UB WPS LED stateJohn Crispin2015-03-151-1/+1
| | | | | | | | | | | | | | | My previous patch regarding the Hornet-UB board (commit: beed4d82d6a0154b0cd5f7b84e2180215ace6718) actually causes the WPS led state to be inverted. Practically this meant that value 0 in /sys/class/led/alfa:blue:wps/brightness would turn the LED on and any positive value (1-255) would turn it off. The above of course is confusing and hence reverting this value back to the way it was before beed4d82d6a0154b0cd5f7b84e2180215ace6718. Signed-off-by: Janne Cederberg <janne.cederberg@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44791 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: Ext LNA patch for TUBE2H and HORNET-UB targetsJohn Crispin2015-03-122-0/+10
| | | | | | Signed-off-by: Christophe Prévotaux <c.prevotaux@rural-networks.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44693 3c298f89-4303-0410-b956-a3cf2f4a3e73
* ar71xx: Hornet UB GPIO WPS/ResetJohn Crispin2015-03-121-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This problem has existed at least since Attitude Adjustment and is also present in trunk. Basically on the Hornet-UB board the functionality of RESET and WPS have "switched places". There are two tickets about the issue at dev.openwrt.org, The solution suggested on them both is incomplete though and introduces the following proglem: Patching as suggested on #14136/#15282 will result in a situation where simply pressing the RESET button on the bottom will cause FACTORY RESET to be run. This is due to GPIO high/low state being incorrect as a result of the above change and virtually the RESET button is in the pressed-down state the entire time. When it is then physically pressed, that causes the opposite, release, to be triggered and since to the board it seemed that the button was pressed long before it was released, the FACTORY RESET results. The attached patch works as expected. I have verified both the incorrect functionality as well as after fixing the issue as described in the patch and flashing the resulting firmware to a Hornet-UB board. Signed-off-by: Janne Cederberg <janne.cederberg@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44692 3c298f89-4303-0410-b956-a3cf2f4a3e73