ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-21 06:33:41 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity
26,429 Commits 9 Branches 75 Tags 905 MiB
38587f87ed
Commit Graph

129 Commits

Author SHA1 Message Date
Felix Fietkau
0615b9d83a mac80211: mark rt2x00 library packages as hidden, there's no point in allowing users to enable them without the packages that depend on them 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 38684
 2013-11-07 20:59:22 +00:00
Felix Fietkau
537e301fab ath9k: gather entropy from raw ADC I/Q samples (use the least significant bit only) 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 38486
 2013-10-20 17:51:17 +00:00
Felix Fietkau
bc3d7c2f1b rt2800usb: merge a fix to slow down tx status polling (#13523) 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 38452
 2013-10-18 13:39:10 +00:00
Felix Fietkau
e90e74000a rt2x00: fix rf id for rt3352 (#14322) 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 38399
 2013-10-14 19:40:30 +00:00
Felix Fietkau
f1ea6d3c2d ath9k: add some more pending fixes / optimizations 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 38398
 2013-10-14 19:38:42 +00:00
Felix Fietkau
d21810a298 ath5k: fix tx status processing errors (causing packet loss and throughput issues) 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 38396
 2013-10-14 19:20:05 +00:00
Felix Fietkau
b907e95125 ath9k: reduce rx buffer allocation size 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 38395
 2013-10-14 19:20:02 +00:00
Hauke Mehrtens
59b362a204 mac80211: b43: fix prefix for config options 
Config options in backports are starting with CPTCFG and not with CONFIG_.
CONFIG_B43_BCMA was never true.

This closes #13883.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 38385
 2013-10-13 20:25:12 +00:00
Felix Fietkau
a3cc10cba7 ath9k: fix rx issues introduced in my last commit (fixes #14307) 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 38362
 2013-10-10 21:10:45 +00:00
Felix Fietkau
d45a1618eb ath9k: add some cleanups and minor fixes 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 38354
 2013-10-10 14:31:22 +00:00
Hauke Mehrtens
b814661167 mac80211: rtlwifi: Align private space in rtl_priv struct 
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 38346
 2013-10-09 09:13:41 +00:00
Hauke Mehrtens
c8e742a080 mac80211: wl12xx: build them again 
WL_TI is bool but was set to =m, which deactivated it. Now it is set to
=y and should be activated in the config so the wl12xx driver gets
build.

This closes #14212.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 38333
 2013-10-07 22:16:17 +00:00
Hauke Mehrtens
16675de754 mac80211: brcmfmac: BRCMFMAC_USB was not set in config 
Somehow BRCMFMAC_USB was not set in the build and brcmfmac.ko did not had usb support.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 38332
 2013-10-07 21:49:28 +00:00
Felix Fietkau
048fc8f0c1 ath9k: fix tx queueing issues after background scans 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 38304
 2013-10-05 12:12:21 +00:00
Hauke Mehrtens
302d27f268 c80211: add iwldvm to iwlwifi, this is needed to support the old wifi card. 
This closes #14258

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 38277
 2013-10-01 22:41:46 +00:00
Felix Fietkau
17be4e9d14 mac80211: add AP inactivity handling / probing fixes to improve stability 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 38257
 2013-09-29 19:42:00 +00:00
Felix Fietkau
f07713f7cf mac80211: really fix the long standing wds ap tx power regression (#14153) 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 38255
 2013-09-29 12:53:21 +00:00
Felix Fietkau
2beabf6c11 ath9k: fix an AP mode powersave issue with aggregation 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 38249
 2013-09-29 11:07:58 +00:00
Felix Fietkau
50bc1a7593 ath9k: add missing tx locking 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 38034
 2013-09-18 13:24:55 +00:00
John Crispin
f12f4074af kernel: make most modules use AutoProbe 
now that we have modprobe we can set more than half of the modules to AutoProbe

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 38021
 2013-09-17 21:45:17 +00:00
Felix Fietkau
b3ceaf834d ath9k: merge a fix for PS-Poll responses + aggregation 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 38017
 2013-09-17 10:07:56 +00:00
Felix Fietkau
fd44388bbf mac80211: drop spoofed packets in ad-hoc mode (fixes #12427) 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 38013
 2013-09-17 09:17:40 +00:00
Felix Fietkau
7a704be4bb ath9k: add another minor tx path fix 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37985
 2013-09-14 15:30:13 +00:00
Felix Fietkau
6eeb0261e6 ath9k: merge a fix for tx processing issues with aggregation 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37982
 2013-09-14 14:46:39 +00:00
Felix Fietkau
247299bfa0 rt2x00: merge an rt2800 initialization order fix 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37922
 2013-09-09 17:31:53 +00:00
Felix Fietkau
768e6750d7 ath9k: clean up some patches 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37919
 2013-09-08 09:38:38 +00:00
Felix Fietkau
249c396583 mac80211: merge a big batch of upstream changes/improvements 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37918
 2013-09-08 09:38:32 +00:00
Hauke Mehrtens
bdc04e379f mac80211: kmod-rtl_pci: fix dependencies 
This fixes the following error:
rtl_pci: Unknown symbol rtl_lps_leave (err 0)
rtl_pci: Unknown symbol rtl_lps_enter (err 0)
rtl8192ce: Unknown symbol rtl_pci_disconnect (err 0)
rtl8192ce: Unknown symbol rtl_pci_probe (err 0)
rtl8192de: Unknown symbol rtl_pci_disconnect (err 0)
rtl8192de: Unknown symbol rtl_pci_probe (err 0)
rtl8192se: Unknown symbol rtl_pci_disconnect (err 0)
rtl8192se: Unknown symbol rtl_pci_probe (err 0)

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 37905
 2013-09-05 20:17:28 +00:00
Hauke Mehrtens
11ae55cc95 mac80211: do not download carl9170 firmware separately, but use the one from linux-firemware 
linux-firemware contains the same version we loaded without this patch.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 37901
 2013-09-05 19:43:38 +00:00
Hauke Mehrtens
82a2969100 ath10k: enable Atheros 802.11ac driver 
This enables usage of the ath10k driver on OpenWrt. Only 2.0 PCI hardware
is supported. The ath10k firmware is currently only available
through github so use that as its source for now.

This goes build tested, not run time tested.

[Hauke: I did some minor changes]

Cc: ath10k@lists.infradead.org
Cc: Kalle Valo <kvalo@qca.qualcomm.com>
Cc: Kathy Giori <kgiori@qca.qualcomm.com>
Cc: Mathieu Olivari <mathieu@qca.qualcomm.com>
Cc: Jerome Proffit <jproffit@qca.qualcomm.com>
Cc: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Cc: Matthew McClintock <mmcclint@qca.qualcomm.com>
Signed-off-by: Luis R. Rodriguez <mcgrof@qca.qualcomm.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 37898
 2013-09-05 19:35:14 +00:00
Gabor Juhos
6c29525f42 mac80211: add a bunch of rt2x00 specific changes 
Backport some rt2x00 specific changes from
wireless-testing/master-2013-08-26 to add
support for RT3573 based devices.

Also refresh the rt2x00 specific patches.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 37843
 2013-08-27 10:44:06 +00:00
Felix Fietkau
eaa8cb7834 mac80211: merge a few ad-hoc mode fixes 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37840
 2013-08-26 17:31:23 +00:00
Felix Fietkau
9cf157ac75 mac80211: disable CCK rates for 802.11n clients on brcmsmac to fix crash issues 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37839
 2013-08-26 17:31:15 +00:00
Felix Fietkau
d03d3aa58c mac80211: merge upstream change to fix mesh rssi thresholds 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37793
 2013-08-15 13:57:11 +00:00
Felix Fietkau
bbf4412bee ath9k: merge a few more cleanups/fixes 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37767
 2013-08-13 10:35:18 +00:00
Felix Fietkau
253d2b511b ath9k: reorganize patches 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37766
 2013-08-13 10:35:14 +00:00
Felix Fietkau
ead5aa354c mac80211: merge upstream patch to suppress unnecessary ad-hoc mode scan with fixed-freq, fixed-bssid 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37764
 2013-08-13 10:35:04 +00:00
Felix Fietkau
fd586c0275 ath9k: fix an rx descriptor processing race condition 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37746
 2013-08-10 14:00:33 +00:00
Felix Fietkau
39ab281fae mac80211: Handle concurrent AP/STA beaconing properly 
Use the "start_disabled" option in hostapd that was added
in the earlier patch.

Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>

SVN-Revision: 37732
 2013-08-06 17:59:09 +00:00
Felix Fietkau
bdb2859a48 ath9k: fold the aggregation rework into 300-pending_work.patch (tracked as upstream submission) 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37716
 2013-08-06 10:31:10 +00:00
Felix Fietkau
5bce86faa2 mac80211: refresh a patch that was using the wrong patch style 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37715
 2013-08-06 10:31:06 +00:00
Felix Fietkau
48b3b74da7 mac80211: fold the rtlwifi patch into 300-pending_work.patch (upstream patch) 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37714
 2013-08-06 10:31:02 +00:00
Felix Fietkau
592f2c6e2b ath9k: add some more fixes for the tx queueing rework 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37713
 2013-08-06 10:30:58 +00:00
Hauke Mehrtens
3f351e2770 mac80211: rtlwifi depends on PCI or USB support in the Kconfig file 
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 37711
 2013-08-05 21:57:48 +00:00
Hauke Mehrtens
9d4145efe5 kernel: fix DMA error when BCM4331 is connected to BCM4706 
The BCM4331 supports a PCIe max request size of 512 bytes and uses
that, but the PCIe controller in the BCM4706 just supports 128 Bytes
and that causes a DMA error for packages bigger than 126 bytes. This
fixes the problem by setting the BCM4331 also to 128 Bytes.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 37709
 2013-08-05 16:17:05 +00:00
Gabor Juhos
259c36358f mac80211: fix rt2x00 dependency 
The current dependency prevents building of the
rt2800{pci,usb} drivers for RT3883. Change the
dependency to fix this.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 37699
 2013-08-05 09:24:19 +00:00
Gabor Juhos
885cf1f19f mac80211: rt2x00: fix LED polarity patch 
The patch causes compiler warning ...

  <...>/drivers/net/wireless/rt2x00/rt2800lib.c: In function 'rt2800_init_eeprom':
  <...>/drivers/net/wireless/rt2x00/rt2800lib.c:5971:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]

... and runtime errors on PCI/USB devices:

  [   11.810000] ieee80211 phy0: rt2x00_set_rt: Info - RT chipset 3071, rev 021c detected
  [   11.830000] ieee80211 phy0: rt2x00_set_rf: Info - RF chipset 0001 detected
  [   11.880000] rt2x00mmio_regbusy_read() Indirect register access failed: offset=0x00007010, value=0x01ff0001
  [   12.080000] usb 1-1: reset high-speed USB device number 2 using ehci-platform
  [   12.250000] ieee80211 phy1: rt2x00_set_rt: Info - RT chipset 5592, rev 0222 detecte
  [   12.300000] ieee80211 phy1: rt2x00_set_rf: Info - RF chipset 000f detected
  [   12.350000] ieee80211 phy1: rt2x00usb_regbusy_read: Error - Indirect register access failed: offset=0x00007010, value=0x1a93b47
  [   12.430000] ieee80211 phy1: rt2x00usb_regbusy_read: Error - Indirect register access failed: offset=0x00007010, value=0x11a93b47
  [   12.480000] ieee80211 phy1: rt2x00usb_regbusy_read: Error - Indirect register access failed: offset=0x00007010, value=0x11a93b47

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 37698
 2013-08-05 09:09:41 +00:00
Gabor Juhos
3573494b19 mac80211: enable RT{33,35,53,55}XX chip support in rt2800usb 
Closes #13951.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 37697
 2013-08-05 09:09:40 +00:00
Jonas Gorski
c7976ae5f8 mac80211: add rtlwifi drivers 
Signed-off-by: Viktar Palstsiuk <viktar.palstsiuk@promwad.com>
[jogo@openwrt.org: add missing DRIVER_11N_SUPPORT select, add missing
		   usb dependencies, backport upstream fixes for Kconfig
		   issues]
Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 37687
 2013-08-04 15:32:36 +00:00
Felix Fietkau
1972a131a0 mac80211: backport a few upstream fixes 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37653
 2013-08-02 10:02:35 +00:00
Felix Fietkau
5bd3f8b164 mac80211: rt2x00: add missing of.h header 
Signed-off-by: Felix Kaechele <heffer@fedoraproject.org>

SVN-Revision: 37618
 2013-07-29 22:45:57 +00:00
Felix Fietkau
36e6d4ca53 ath9k: fix several issues in the tx queueing rework 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37616
 2013-07-29 19:44:05 +00:00
John Crispin
2b906791be mac80211: rt2x00: fix default register settings for rt5350 
Comparing the RTSDK driver and mac80211 revealed, that this register needs
to have a special setup on rt5350.

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 37608
 2013-07-29 13:10:12 +00:00
John Crispin
7f895c6776 mac80211: rt2x00: enable setting wifi led polarity from OF 
This patch enables setting the wifi led polarity from OF.
It can be used in a DTS' wmac section like this:

   ralink,led-polarity = <1>;

Valid values are 0 or 1.

Signed-off-by: Felix Kaechele <heffer@fedoraproject.org>

SVN-Revision: 37607
 2013-07-29 13:09:16 +00:00
Felix Fietkau
1ff304e5f5 rt2x00: merge fix for queue stopping 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37603
 2013-07-29 12:49:01 +00:00
Felix Fietkau
c67a12711d mac80211: add support for verbose builds using V=sc 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37597
 2013-07-29 09:38:08 +00:00
John Crispin
4176b6fdd3 strict_strtoul is obsolete, use kstrtoul instead 
based on http://patchwork.openwrt.org/patch/3827/

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 37562
 2013-07-27 09:23:18 +00:00
Felix Fietkau
4478c69b86 authsae: adapt uci scripts to use authsae 
This patch modifies the uci scripts to be able to
start meshd-nl80211 for encrypted mesh networks,
therefor a new script (authsae.sh) is inserted.

Signed-off-by: Emanuel Taube <emanuel.taube@gmail.com>
[etienne.champetier@free.fr: just update mac80211.sh path]
Signed-off-by: Etienne CHAMPETIER <etienne.champetier@free.fr>

SVN-Revision: 37554
 2013-07-26 10:02:59 +00:00
John Crispin
3251cddf31 mac8021: add ath9k pcie id for AR9381 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 37536
 2013-07-25 20:28:45 +00:00
Felix Fietkau
a0129dfd8e ath9k: add initial tx queueing rework patches 
This forces all packets (even for un-aggregated traffic) through
software queues to improve fairness and stability

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37483
 2013-07-20 16:37:50 +00:00
Jonas Gorski
108b880748 mac80211: add missing dependencies 
Add missing dependencies for rt2800-lib and lib80211.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 37422
 2013-07-19 09:49:04 +00:00
Felix Fietkau
eb8d23819f ath5k: fix AHB support dependency (#13896) 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37377
 2013-07-17 13:58:15 +00:00
Felix Fietkau
a5e70c13f8 mac80211: fix a crash in legacy minstrel when no STA exists 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37342
 2013-07-15 12:35:23 +00:00
Hauke Mehrtens
13f3c9dbe5 mac80211: b43: load b43 on core rev 17 and 18. 
This is now controlled by a module parameter and the default
configuration depends on brcmsmac being installed.
This patch causes b43 to take core rev 17 and 18 always by default.

SVN-Revision: 37307
 2013-07-14 14:23:04 +00:00
Hauke Mehrtens
71230b33c1 mac80211: b43: activate LP-Phy support every time 
SVN-Revision: 37305
 2013-07-14 14:13:32 +00:00
Felix Fietkau
299c2ceafa mac80211: tweak mac address allocation 
Apparently there are some broken devices out there that have the local
bit already set in the factory MAC address. Move the | 0x2 over to the
other side of the xor operation to fix this without affecting devices
with proper addresses.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37269
 2013-07-13 11:39:48 +00:00
Felix Fietkau
92961e0917 mac80211: reconfigure in Build/Compile instead of Build/Configure to catch kernel config changes 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37265
 2013-07-12 08:10:19 +00:00
Felix Fietkau
f8543faec4 mac80211: merge a fix for PS-Poll handling, refresh patches 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37264
 2013-07-12 07:59:59 +00:00
Felix Fietkau
e389c2b410 mac80211: remove bogus module params from compat.ko 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37263
 2013-07-12 07:59:51 +00:00
John Crispin
cb179cb262 mac80211: make rt2x00_soc depend on !rt3883 
https://dev.openwrt.org/ticket/13777

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 37162
 2013-07-04 13:31:18 +00:00
Felix Fietkau
16079fbd9a rt2x00: fix rf id override for RT5350 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37109
 2013-06-30 17:54:20 +00:00
Felix Fietkau
2d8990256c mac80211: use a new tarball with updated backport code 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37105
 2013-06-30 14:49:14 +00:00
Felix Fietkau
12c033dfd9 mac80211: update to wireless-testing 2013-06-27, fix ATH_USER_REGD handling 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37097
 2013-06-30 10:44:19 +00:00
Felix Fietkau
ae6fc0e4bd ath9k: fix tx queue pending frame counter when dropping packets 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37081
 2013-06-29 12:38:15 +00:00
Felix Fietkau
78ac19be04 mac80211: fix cck rate sampling in minstrel_ht 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37078
 2013-06-28 19:14:54 +00:00
John Crispin
1761b7b370 mac80211: disable rt2x00 on mt7620a 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 37037
 2013-06-27 07:25:13 +00:00
Felix Fietkau
0f003be010 ath9k: fix a minor rcu issue 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37013
 2013-06-22 13:59:55 +00:00
John Crispin
fdb8d23745 mac80211: fix compile error on rt2x00 when buildin for SoC 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 37008
 2013-06-21 16:54:46 +00:00
John Crispin
4ebf19b48f packages: clean up the package folder 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 37007
 2013-06-21 16:54:37 +00:00