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, master has been updated via 3a9e1773aa78eb3cc08f30e4ae5c8af5be4177f6 (commit) via f023dcb3d444c20b42a4298d1db2bf3a6948f6e4 (commit) from 0b09e72214df3d4d62c1a061f1e8866020877017 (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 3a9e1773aa78eb3cc08f30e4ae5c8af5be4177f6 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Feb 6 09:35:01 2010 +0100

mISDN-hfcusb bchannel endpoint patch.

commit f023dcb3d444c20b42a4298d1db2bf3a6948f6e4 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Feb 6 09:33:29 2010 +0100

Fix mdadm and initscripts rootfile.

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

Summary of changes: config/rootfiles/common/initscripts | 2 +- config/rootfiles/core/37/filelists/files | 4 ++- config/rootfiles/core/37/update.sh | 4 +- config/rootfiles/packages/mdadm | 2 +- doc/packages-list.txt | 2 +- lfs/mISDN | 1 + src/patches/mISDN-hfcusb_bchannels.patch | 56 ++++++++++++++++++++++++++++++ 7 files changed, 65 insertions(+), 6 deletions(-) create mode 100644 src/patches/mISDN-hfcusb_bchannels.patch

Difference in files: diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts index 1ea3c7a..ae40f4a 100644 --- a/config/rootfiles/common/initscripts +++ b/config/rootfiles/common/initscripts @@ -195,4 +195,4 @@ etc/rc.d/rc6.d/K85tmpfs #etc/rc.d/rc3.d/S99miau #etc/rc.d/rc6.d/K01miau #etc/rc.d/init.d/netsnmpd -etc/rc.d/init.d/mdadm \ No newline at end of file +#etc/rc.d/init.d/mdadm diff --git a/config/rootfiles/core/37/filelists/files b/config/rootfiles/core/37/filelists/files index 5e9d1fa..075eab6 100644 --- a/config/rootfiles/core/37/filelists/files +++ b/config/rootfiles/core/37/filelists/files @@ -1,4 +1,6 @@ etc/system-release lib/modules/2.6.27.42-ipfire/kernel/net lib/modules/2.6.27.42-ipfire-xen/kernel/net -srv/web/ipfire/cgi-bin/urlfilter.cgi \ No newline at end of file +lib/modules/2.6.27.42-ipfire/mISDN/hfcsusb.ko +lib/modules/2.6.27.42-ipfire-xen/mISDN/hfcsusb.ko +srv/web/ipfire/cgi-bin/urlfilter.cgi diff --git a/config/rootfiles/core/37/update.sh b/config/rootfiles/core/37/update.sh index 80e8286..e78621e 100644 --- a/config/rootfiles/core/37/update.sh +++ b/config/rootfiles/core/37/update.sh @@ -42,8 +42,8 @@ perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"

# #Run depmod to rebuld module informations -#depmod 2.6.27.42-ipfire -#depmod 2.6.27.42-ipfire-xen +depmod 2.6.27.42-ipfire +depmod 2.6.27.42-ipfire-xen #Finish #Don't report the exitcode last command exit 0 diff --git a/config/rootfiles/packages/mdadm b/config/rootfiles/packages/mdadm index 680a3f1..da4238b 100644 --- a/config/rootfiles/packages/mdadm +++ b/config/rootfiles/packages/mdadm @@ -6,4 +6,4 @@ sbin/mdmon #usr/share/man/man5/mdadm.conf.5 #usr/share/man/man8/mdadm.8 #usr/share/man/man8/mdmon.8 -etc/rc.d/init.d/mdadm \ No newline at end of file +etc/rc.d/init.d/mdadm diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 03a2a6a..027de07 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -135,7 +135,7 @@ * gzip-1.3.5 * hddtemp-0.3-beta14 * hdparm-8.9 -* hostapd-0.7.1 +* hostapd-0.6.9 * hplip-2.7.10 * hso-1.9-kmod-2.6.27.42-ipfire * hso-1.9-kmod-2.6.27.42-ipfire-xen diff --git a/lfs/mISDN b/lfs/mISDN index 7d15720..b4b5e56 100644 --- a/lfs/mISDN +++ b/lfs/mISDN @@ -77,6 +77,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_SRC)/mISDN* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_SRC)/mISDN && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-enable_disabled_cards.patch + cd $(DIR_SRC)/mISDN && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-hfcusb_bchannels.patch cd $(DIR_SRC)/mISDN && make KVERS=$(KVER)-$(VERSUFIX) force cd $(DIR_SRC)/mISDN && make KVERS=$(KVER)-$(VERSUFIX) $(MAKETUNING) cd $(DIR_SRC)/mISDN && make KVERS=$(KVER)-$(VERSUFIX) \ diff --git a/src/patches/mISDN-hfcusb_bchannels.patch b/src/patches/mISDN-hfcusb_bchannels.patch new file mode 100644 index 0000000..322239d --- /dev/null +++ b/src/patches/mISDN-hfcusb_bchannels.patch @@ -0,0 +1,56 @@ +From: mbachem info@colognechip.com +Date: Thu, 17 Dec 2009 01:45:58 +0000 (+0100) +Subject: mISDN: Bugfix hfcsusb: usb endpoint activation/deactivation +X-Git-Url: http://git.misdn.org/?p=mISDN.git;a=commitdiff_plain;h=e29960990df531faff420... + +mISDN: Bugfix hfcsusb: usb endpoint activation/deactivation + +fixed activation/deactivation of B1/B2's USB endpoints + +Signed-off-by: mbachem info@colognechip.com +--- + +diff --git a/drivers/isdn/hardware/mISDN/hfcsusb.c b/drivers/isdn/hardware/mISDN/hfcsusb.c +index c5f29db..e8c5754 100644 +--- a/drivers/isdn/hardware/mISDN/hfcsusb.c ++++ b/drivers/isdn/hardware/mISDN/hfcsusb.c +@@ -36,7 +36,7 @@ + #include <linux/isdn_compat.h> + #include "hfcsusb.h" + +-static const char *hfcsusb_rev = "Revision: 0.3.3 (socket), 2008-11-05"; ++static const char *hfcsusb_rev = "Revision: 0.3.4 (socket), 2009-12-16"; + + static unsigned int debug; + static int poll = DEFAULT_TRANSP_BURST_SZ; +@@ -239,7 +239,7 @@ hfcusb_l2l1B(struct mISDNchannel *ch, struct sk_buff *skb) + return ret; + case PH_ACTIVATE_REQ: + if (!test_and_set_bit(FLG_ACTIVE, &bch->Flags)) { +- hfcsusb_start_endpoint(hw, bch->nr); ++ hfcsusb_start_endpoint(hw, bch->nr-1); + ret = hfcsusb_setup_bch(bch, ch->protocol); + } else + ret = 0; +@@ -502,12 +502,6 @@ open_bchannel(struct hfcsusb *hw, struct channel_req *rq) + bch->ch.protocol = rq->protocol; + rq->ch = &bch->ch; + +- /* start USB endpoint for bchannel */ +- if (rq->adr.channel == 1) +- hfcsusb_start_endpoint(hw, HFC_CHAN_B1); +- else +- hfcsusb_start_endpoint(hw, HFC_CHAN_B2); +- + if (!try_module_get(THIS_MODULE)) + printk(KERN_WARNING "%s: %s:cannot get module\n", + hw->name, __func__); +@@ -1813,7 +1807,7 @@ deactivate_bchannel(struct bchannel *bch) + mISDN_clear_bchannel(bch); + spin_unlock_irqrestore(&hw->lock, flags); + hfcsusb_setup_bch(bch, ISDN_P_NONE); +- hfcsusb_stop_endpoint(hw, bch->nr); ++ hfcsusb_stop_endpoint(hw, bch->nr-1); + } + + /*

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