mISDN-hfcusb bchannel endpoint patch.

diff --git a/config/rootfiles/core/37/filelists/files b/config/rootfiles/core/37/filelists/files
index 5e9d1fa0045dd6232a24d3811ea8c8ee50297d32..075eab6242030e5c59d474adbb81c0126abb1a17 100644 (file)
--- 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 80e828677aee067f55a9f4bc2f467268dc6c42aa..e78621e34354250b8254e8d6aae27c859b151da9 100644 (file)
--- 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/doc/packages-list.txt b/doc/packages-list.txt
index 03a2a6a5bf6e67ed7df17821e24f11f781ff92ab..027de07f54c3416eddfabc01e558a9bc4087edef 100644 (file)
--- 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 7d157203fe1046b2ef930080f623593ddb68b513..b4b5e566016795a84c5eb55c43060872e245e2ff 100644 (file)
--- 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 (file)
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=e29960990df531faff42023dd663e8d6e2bf55fe;hp=5f0f8aed322de56932da90810062f46170443553
+
+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);
+ }
+ 
+ /*