This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via f7c508b508e7d3d72fc670f95f9623704e03e8b5 (commit) via f7cba53fcfdc0d26e9ccdecc2008281fa1bbc95c (commit) via fac92c6d25038f61430a4e872e720ba00b539385 (commit) from a6b8b894848742ff0afe25ef62c2117e67b44311 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit f7c508b508e7d3d72fc670f95f9623704e03e8b5 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Feb 23 23:33:47 2010 +0100

Add patch for ath5k to fix "no txbuf available".

commit f7cba53fcfdc0d26e9ccdecc2008281fa1bbc95c Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Feb 24 07:55:34 2010 +0100

mkinitcpio: remove "-9" at lzma compression (need much memory).

commit fac92c6d25038f61430a4e872e720ba00b539385 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Feb 23 21:02:15 2010 +0100

Fix disk (media/hardware) graphs with xen.

-----------------------------------------------------------------------

Summary of changes: config/collectd/collectd.conf | 2 +- config/rootfiles/oldcore/37/filelists/files | 13 ---- doc/packages-list.txt | 1 + html/cgi-bin/hardwaregraphs.cgi | 2 +- html/cgi-bin/media.cgi | 2 +- lfs/linux | 3 + lfs/mkinitcpio | 2 +- ...inux-2.6.32-ath5k_fix_setup_for_CAB_queue.patch | 75 ++++++++++++++++++++ 8 files changed, 83 insertions(+), 17 deletions(-) delete mode 100644 config/rootfiles/oldcore/37/filelists/files create mode 100644 src/patches/linux-2.6.32-ath5k_fix_setup_for_CAB_queue.patch

Difference in files: diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf index 2f86f07..b0166e5 100644 --- a/config/collectd/collectd.conf +++ b/config/collectd/collectd.conf @@ -37,7 +37,7 @@ LoadPlugin syslog </Plugin>

<Plugin "disk"> - Disk "/[0-9]$/" + Disk "/[hs]d[a-z][0-9]$/" IgnoreSelected true </Plugin>

diff --git a/config/rootfiles/oldcore/37/filelists/files b/config/rootfiles/oldcore/37/filelists/files deleted file mode 100644 index 4026517..0000000 --- a/config/rootfiles/oldcore/37/filelists/files +++ /dev/null @@ -1,13 +0,0 @@ -etc/system-release -lib/modules/2.6.27.42-ipfire/kernel/net -lib/modules/2.6.27.42-ipfire-xen/kernel/net -lib/modules/2.6.27.42-ipfire/mISDN/hfcsusb.ko -lib/modules/2.6.27.42-ipfire-xen/mISDN/hfcsusb.ko -lib/modules/2.6.27.42-ipfire/kernel/drivers/hwmon/coretemp.ko -lib/modules/2.6.27.42-ipfire-xen/kernel/drivers/hwmon/coretemp.ko -lib/modules/2.6.27.42-ipfire/kernel/drivers/net/et131x.ko -lib/modules/2.6.27.42-ipfire-xen/kernel/drivers/net/et131x.ko -lib/modules/2.6.27.42-ipfire/kernel/arch/x86/kernel/cpu/cpufreq/p4-clockmod.ko -lib/modules/2.6.27.42-ipfire-xen/kernel/arch/x86/kernel/cpu/cpufreq/p4-clockmod.ko -srv/web/ipfire/cgi-bin/urlfilter.cgi -srv/web/ipfire/cgi-bin/outgoingfw.cgi \ No newline at end of file diff --git a/doc/packages-list.txt b/doc/packages-list.txt index e7d9659..75d375d 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -87,6 +87,7 @@ * e2fsprogs-1.39 * ebtables-v2.0.8-2 * ed-0.2 +* eject-2.1.5 * elinks-0.11.6 * esniper-2-19-0 * espgs-8.15.1 diff --git a/html/cgi-bin/hardwaregraphs.cgi b/html/cgi-bin/hardwaregraphs.cgi index 16000de..dabdfd1 100644 --- a/html/cgi-bin/hardwaregraphs.cgi +++ b/html/cgi-bin/hardwaregraphs.cgi @@ -67,7 +67,7 @@ if ( $querry[0] =~ "hwtemp"){ print "Content-type: image/png\n\n"; binmode(STDOUT); &Graphs::updatethermaltempgraph($querry[1]); -}elsif ( $querry[0] =~ "sd?" || $querry[0] =~ "hd?" ){ +}elsif ( $querry[0] =~ "sd?" || $querry[0] =~ "hd?" || $querry[0] =~ "xvd??" ){ print "Content-type: image/png\n\n"; binmode(STDOUT); &Graphs::updatehddgraph($querry[0],$querry[1]); diff --git a/html/cgi-bin/media.cgi b/html/cgi-bin/media.cgi index 4fe472a..6a89ca8 100644 --- a/html/cgi-bin/media.cgi +++ b/html/cgi-bin/media.cgi @@ -47,7 +47,7 @@ $querry[1] = 'hour' unless defined $querry[1];

my @devices = `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`;

-if ( $querry[0] =~ "sd?" || $querry[0] =~ "hd?" ){ +if ( $querry[0] =~ "sd?" || $querry[0] =~ "hd?" || $querry[0] =~ "xvd??"){ print "Content-type: image/png\n\n"; binmode(STDOUT); diff --git a/lfs/linux b/lfs/linux index 6d2465a..db2ca20 100644 --- a/lfs/linux +++ b/lfs/linux @@ -130,6 +130,9 @@ endif # # Add Vodafone K3565-Z USB ID's to option driver # cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27.25-option_add_vf-k3565-z_usbids.patch

+ # Add patch to fix ath5k "no txbuf available" + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32-ath5k_fix_setup_for_CAB_queue.patch + # Not report deprecated syscall 1.23 (for kudzu) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch

diff --git a/lfs/mkinitcpio b/lfs/mkinitcpio index 0d3ec98..47de3ea 100644 --- a/lfs/mkinitcpio +++ b/lfs/mkinitcpio @@ -76,6 +76,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) sed -i 's|^HOOKS=.*|HOOKS="base udev autodetect ide usb scsi pata sata virtio filesystems"|g' /etc/mkinitcpio.conf sed -i 's|^MODULES=.*|MODULES="reiser4 reiserfs ext3 ehci_hcd"|g' /etc/mkinitcpio.conf sed -i 's|ide-cd|ide-cd ide-generic|g' /lib/initcpio/install/ide - sed -i 's| gzip | lzma |g' /sbin/mkinitcpio + sed -i 's| gzip -9 | lzma |g' /sbin/mkinitcpio @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/patches/linux-2.6.32-ath5k_fix_setup_for_CAB_queue.patch b/src/patches/linux-2.6.32-ath5k_fix_setup_for_CAB_queue.patch new file mode 100644 index 0000000..fbe3098 --- /dev/null +++ b/src/patches/linux-2.6.32-ath5k_fix_setup_for_CAB_queue.patch @@ -0,0 +1,75 @@ +diff --git a/drivers/net/wireless/ath/ath5k/ath5k.h b/drivers/net/wireless/ath/ath5k/ath5k.h +index 66bcb50..ad4d446 100644 +--- a/drivers/net/wireless/ath/ath5k/ath5k.h ++++ b/drivers/net/wireless/ath/ath5k/ath5k.h +@@ -535,7 +535,7 @@ struct ath5k_txq_info { + u32 tqi_cbr_period; /* Constant bit rate period */ + u32 tqi_cbr_overflow_limit; + u32 tqi_burst_time; +- u32 tqi_ready_time; /* Not used */ ++ u32 tqi_ready_time; /* Time queue waits after an event */ + }; + + /* +diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c +index b501537..535a6af 100644 +--- a/drivers/net/wireless/ath/ath5k/base.c ++++ b/drivers/net/wireless/ath/ath5k/base.c +@@ -1516,7 +1516,8 @@ ath5k_beaconq_config(struct ath5k_softc *sc) + + ret = ath5k_hw_get_tx_queueprops(ah, sc->bhalq, &qi); + if (ret) +- return ret; ++ goto err; ++ + if (sc->opmode == NL80211_IFTYPE_AP || + sc->opmode == NL80211_IFTYPE_MESH_POINT) { + /* +@@ -1543,10 +1544,25 @@ ath5k_beaconq_config(struct ath5k_softc *sc) + if (ret) { + ATH5K_ERR(sc, "%s: unable to update parameters for beacon " + "hardware queue!\n", __func__); +- return ret; ++ goto err; + } ++ ret = ath5k_hw_reset_tx_queue(ah, sc->bhalq); /* push to h/w */ ++ if (ret) ++ goto err; + +- return ath5k_hw_reset_tx_queue(ah, sc->bhalq); /* push to h/w */; ++ /* reconfigure cabq with ready time to 80% of beacon_interval */ ++ ret = ath5k_hw_get_tx_queueprops(ah, AR5K_TX_QUEUE_ID_CAB, &qi); ++ if (ret) ++ goto err; ++ ++ qi.tqi_ready_time = (sc->bintval * 80) / 100; ++ ret = ath5k_hw_set_tx_queueprops(ah, AR5K_TX_QUEUE_ID_CAB, &qi); ++ if (ret) ++ goto err; ++ ++ ret = ath5k_hw_reset_tx_queue(ah, AR5K_TX_QUEUE_ID_CAB); ++err: ++ return ret; + } + + static void +diff --git a/drivers/net/wireless/ath/ath5k/qcu.c b/drivers/net/wireless/ath/ath5k/qcu.c +index abe36c0..9122a85 100644 +--- a/drivers/net/wireless/ath/ath5k/qcu.c ++++ b/drivers/net/wireless/ath/ath5k/qcu.c +@@ -408,12 +408,13 @@ int ath5k_hw_reset_tx_queue(struct ath5k_hw *ah, unsigned int queue) + break; + + case AR5K_TX_QUEUE_CAB: ++ /* XXX: use BCN_SENT_GT, if we can figure out how */ + AR5K_REG_ENABLE_BITS(ah, AR5K_QUEUE_MISC(queue), +- AR5K_QCU_MISC_FRSHED_BCN_SENT_GT | ++ AR5K_QCU_MISC_FRSHED_DBA_GT | + AR5K_QCU_MISC_CBREXP_DIS | + AR5K_QCU_MISC_CBREXP_BCN_DIS); + +- ath5k_hw_reg_write(ah, ((AR5K_TUNE_BEACON_INTERVAL - ++ ath5k_hw_reg_write(ah, ((tq->tqi_ready_time - + (AR5K_TUNE_SW_BEACON_RESP - + AR5K_TUNE_DMA_BEACON_RESP) - + AR5K_TUNE_ADDITIONAL_SWBA_BACKOFF) * 1024) |

hooks/post-receive -- IPFire 2.x development tree