ISDN patches for 2.6.35
Subsystems (3)
cover ISDN patches for 2.6.35
Karsten, David,
following are seven patches to the CAPI subsystem and the Gigaset driver I'd like to see included in kernel release 2.6.35. The first three respond to user reports about an observed hang of the userspace command "capiinit stop".
The others are cleanups from the ongoing driver development.
Thanks,
Tilman
Tilman Schmidt (7):
Documentation/isdn: CAPI controller interface amendment isdn/capi: make reset_ctr op truly optional isdn/gigaset: remove dummy CAPI method implementations isdn/gigaset: adjust usb_gigaset tty write buffer limit isdn/gigaset: avoid copying AT commands twice isdn/gigaset: ignore irrelevant device responses isdn/gigaset: drop obsolete FIXME comment
Documentation/isdn/INTERFACE.CAPI | 8 +- drivers/isdn/capi/kcapi.c | 6 + drivers/isdn/gigaset/bas-gigaset.c | 51 ++----------- drivers/isdn/gigaset/capi.c | 28 ------- drivers/isdn/gigaset/common.c | 2 drivers/isdn/gigaset/ev-layer.c | 142 ++++++++++++------------------------- drivers/isdn/gigaset/gigaset.h | 9 -- drivers/isdn/gigaset/interface.c | 36 +++++++-- drivers/isdn/gigaset/ser-gigaset.c | 27 +------ drivers/isdn/gigaset/usb-gigaset.c | 29 +------ 10 files changed, 117 insertions(+), 221 deletions(-)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/7 Documentation/isdn: CAPI controller interface amendment
Mention that the CAPI controller methods load_firmware() and reset_ctr() are asynchronous, and should signal completion.
Impact: documentation
--- Documentation/isdn/INTERFACE.CAPI | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
Documentation/isdn/INTERFACE.CAPI +6 -2
@@ -113,12 +113,16 @@ char *driver_name int (*load_firmware)(struct capi_ctr *ctrlr, capiloaddata *ldata) (optional) pointer to a callback function for sending firmware and configuration data to the device + The function may return before the operation has completed. + Completion must be signalled by a call to capi_ctr_ready(). Return value: 0 on success, error code on error Called in process context. void (*reset_ctr)(struct capi_ctr *ctrlr) - (optional) pointer to a callback function for performing a reset on - the device, releasing all registered applications + (optional) pointer to a callback function for stopping the device, + releasing all registered applications + The function may return before the operation has completed. + Completion must be signalled by a call to capi_ctr_down(). Called in process context. void (*register_appl)(struct capi_ctr *ctrlr, u16 applid,
Signature · 1 line
1.6.5.3.298.g39add
PATCH 2/7 isdn/capi: make reset_ctr op truly optional
In reply to a message not in the archiveThe CAPI controller operation reset_ctr is marked as optional, and not all drivers do implement it. Add a check to the kernel CAPI whether it exists before trying to call it.
Impact: oops prevention
--- drivers/isdn/capi/kcapi.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
drivers/isdn/capi/kcapi.c +6 -0
@@ -1147,6 +1147,12 @@ load_unlock_out:if (ctr->state ==CAPI_CTR_DETECTED ) goto reset_unlock_out; +if (ctr->reset_ctr ==NULL ) { +printk (KERN_DEBUG "kcapi: reset: no reset function\n" ); + retval = -ESRCH ; + goto reset_unlock_out; + } + ctr->reset_ctr (ctr); retval =wait_on_ctr_state (ctr,CAPI_CTR_DETECTED );
Signature · 1 line
1.6.5.3.298.g39add
PATCH 3/7 isdn/gigaset: remove dummy CAPI method implementations
In reply to a message not in the archiveDummy implementations for the optional CAPI controller operations load_firmware and reset_ctr can cause userspace callers to hang indefinitely. It's better not to implement them at all.
Impact: bugfix
--- drivers/isdn/gigaset/capi.c | 28 ++-------------------------- 1 files changed, 2 insertions(+), 26 deletions(-)
drivers/isdn/gigaset/capi.c +2 -26
@@ -933,30 +933,6 @@ void gigaset_isdn_stop(struct cardstate *cs)*/ /* -* load firmware -*/ -static int gigaset_load_firmware (struct capi_ctr *ctr,capiloaddata *data) -{ -struct cardstate *cs = ctr->driverdata; - -/* AVM specific operation, not needed for Gigaset -- ignore */ -dev_notice (cs->dev,"load_firmware ignored\n" ); - -return 0 ; -} - -/* -* reset (deactivate) controller -*/ -static void gigaset_reset_ctr (struct capi_ctr *ctr) -{ -struct cardstate *cs = ctr->driverdata; - -/* AVM specific operation, not needed for Gigaset -- ignore */ -dev_notice (cs->dev,"reset_ctr ignored\n" ); -} - -/* * register CAPI application */ static void gigaset_register_appl(struct capi_ctr *ctr, u16 appl,
@@ -2213,8 +2189,8 @@ int gigaset_isdn_regdev(struct cardstate *cs, const char *isdnid) iif->ctr.driverdata = cs;strncpy (iif->ctr.name, isdnid,sizeof (iif->ctr.name)); iif->ctr.driver_name ="gigaset" ; - iif->ctr.load_firmware = gigaset_load_firmware; - iif->ctr.reset_ctr = gigaset_reset_ctr; + iif->ctr.load_firmware =NULL ; + iif->ctr.reset_ctr =NULL ; iif->ctr.register_appl = gigaset_register_appl; iif->ctr.release_appl = gigaset_release_appl; iif->ctr.send_message = gigaset_send_message;
Signature · 1 line
1.6.5.3.298.g39add
PATCH 4/7 isdn/gigaset: adjust usb_gigaset tty write buffer limit
In reply to a message not in the archiveThe usb_gigaset driver's write buffer limit was different from those of the other hardware modules for no good reason. Set it to the same value as the others, derived from the Siemens documentation.
Impact: cosmetic
--- drivers/isdn/gigaset/usb-gigaset.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/isdn/gigaset/usb-gigaset.c +2 -1
@@ -39,7 +39,8 @@ MODULE_PARM_DESC(cidmode, "Call-ID mode");#define GIGASET_MODULENAME "usb_gigaset"#define GIGASET_DEVNAME "ttyGU" -#define IF_WRITEBUF 2000/* arbitrary limit */ +/* length limit according to Siemens 3070usb-protokoll.doc ch. 2.1 */ +#define IF_WRITEBUF 264/* Values for the Gigaset M105 Data */ #define USB_M105_VENDOR_ID 0x0681
Signature · 1 line
1.6.5.3.298.g39add
PATCH 5/7 isdn/gigaset: avoid copying AT commands twice
In reply to a message not in the archiveChange the Gigaset driver's internal write_cmd interface to accept a cmdbuf structure instead of a string. This avoids copying formatted AT commands a second time.
Impact: optimization
--- drivers/isdn/gigaset/bas-gigaset.c | 51 +++++------------------- drivers/isdn/gigaset/ev-layer.c | 75 ++++++++++++++++------------------- drivers/isdn/gigaset/gigaset.h | 4 +- drivers/isdn/gigaset/interface.c | 36 ++++++++++++++--- drivers/isdn/gigaset/ser-gigaset.c | 27 ++---------- drivers/isdn/gigaset/usb-gigaset.c | 26 ++---------- 6 files changed, 85 insertions(+), 134 deletions(-)
drivers/isdn/gigaset/bas-gigaset.c +11 -40
@@ -1913,65 +1913,41 @@ static int start_cbsend(struct cardstate *cs)* USB transmission is started if necessary. * parameters: * cs controller state structure -* buf command string to send -* len number of bytes to send (max. IF_WRITEBUF) -* wake_tasklet tasklet to run when transmission is completed -* (NULL if none) +* cb command buffer structure * return value: * number of bytes queued on success * error code < 0 on error */ -static int gigaset_write_cmd (struct cardstate *cs, -const unsigned char *buf,int len, -struct tasklet_struct *wake_tasklet) +static int gigaset_write_cmd (struct cardstate *cs,struct cmdbuf_t *cb) { -struct cmdbuf_t *cb;unsigned long flags;int rc;gigaset_dbg_buffer (cs->mstate !=MS_LOCKED ?DEBUG_TRANSCMD :DEBUG_LOCKCMD , -"CMD Transmit" , len, buf); - -if (len <=0 ) { -/* nothing to do */ - rc =0 ; - goto notqueued; - } +"CMD Transmit" , cb->len, cb->buf);/* translate "+++" escape sequence sent as a single separate command * into "close AT channel" command for error recovery * The next command will reopen the AT channel automatically. */ -if (len ==3 && !memcmp (buf,"+++" ,3 )) { +if (cb->len ==3 && !memcmp (cb->buf,"+++" ,3 )) { +kfree (cb); rc =req_submit (cs->bcs,HD_CLOSE_ATCHANNEL ,0 ,BAS_TIMEOUT ); - goto notqueued; - } - -if (len >IF_WRITEBUF ) - len =IF_WRITEBUF ; - cb =kmalloc (sizeof (struct cmdbuf_t ) + len,GFP_ATOMIC ); -if (!cb) { -dev_err (cs->dev,"%s: out of memory\n" , __func__); - rc = -ENOMEM ; - goto notqueued; +if (cb->wake_tasklet) +tasklet_schedule (cb->wake_tasklet); +return rc <0 ? rc : cb->len; } -memcpy (cb->buf, buf, len); - cb->len = len; - cb->offset =0 ; - cb->next =NULL ; - cb->wake_tasklet = wake_tasklet; -spin_lock_irqsave (&cs->cmdlock, flags); cb->prev = cs->lastcmdbuf;if (cs->lastcmdbuf) cs->lastcmdbuf->next = cb;else { cs->cmdbuf = cb; - cs->curlen = len; + cs->curlen = cb->len; } - cs->cmdbytes += len; + cs->cmdbytes += cb->len; cs->lastcmdbuf = cb;spin_unlock_irqrestore (&cs->cmdlock, flags);
@@ -1988,12 +1964,7 @@ static int gigaset_write_cmd(struct cardstate *cs, } rc =start_cbsend (cs);spin_unlock_irqrestore (&cs->lock, flags); -return rc <0 ? rc : len; - -notqueued:/* request handled without queuing */ -if (wake_tasklet) -tasklet_schedule (wake_tasklet); -return rc; +return rc <0 ? rc : cb->len; }/* gigaset_write_room
drivers/isdn/gigaset/ev-layer.c +34 -41
90 lines not on this page · raw message
drivers/isdn/gigaset/gigaset.h +1 -3
@@ -575,9 +575,7 @@ struct bas_bc_state {struct gigaset_ops {/* Called from ev-layer.c/interface.c for sending AT commands to the device */ -int (*write_cmd)(struct cardstate *cs, -const unsigned char *buf,int len, -struct tasklet_struct *wake_tasklet); +int (*write_cmd)(struct cardstate *cs,struct cmdbuf_t *cb);/* Called from interface.c for additional device control */ int (*write_room)(struct cardstate *cs);
drivers/isdn/gigaset/interface.c +29 -7
@@ -339,7 +339,8 @@ static int if_tiocmset(struct tty_struct *tty, struct file *file,static int if_write (struct tty_struct *tty,const unsigned char *buf,int count) {struct cardstate *cs; -int retval = -ENODEV ; +struct cmdbuf_t *cb; +int retval; cs = (struct cardstate *) tty->driver_data;if (!cs) {
@@ -355,18 +356,39 @@ static int if_write(struct tty_struct *tty, const unsigned char *buf, int count)if (!cs->connected) {gig_dbg (DEBUG_IF ,"not connected" ); retval = -ENODEV ; - }else if (!cs->open_count) + goto done; + } +if (!cs->open_count) {dev_warn (cs->dev,"%s: device not opened\n" , __func__); -else if (cs->mstate !=MS_LOCKED ) { + retval = -ENODEV ; + goto done; + } +if (cs->mstate !=MS_LOCKED ) {dev_warn (cs->dev,"can't write to unlocked device\n" ); retval = -EBUSY ; - }else { - retval = cs->ops->write_cmd (cs, buf, count, - &cs->if_wake_tasklet); + goto done; + } +if (count <=0 ) { +/* nothing to do */ + retval =0 ; + goto done; } -mutex_unlock (&cs->mutex); + cb =kmalloc (sizeof (struct cmdbuf_t ) + count,GFP_KERNEL ); +if (!cb) { +dev_err (cs->dev,"%s: out of memory\n" , __func__); + retval = -ENOMEM ; + goto done; + } +memcpy (cb->buf, buf, count); + cb->len = count; + cb->offset =0 ; + cb->next =NULL ; + cb->wake_tasklet = &cs->if_wake_tasklet; + retval = cs->ops->write_cmd (cs, cb); +done: +mutex_unlock (&cs->mutex);return retval; }
drivers/isdn/gigaset/ser-gigaset.c +5 -22
@@ -241,30 +241,13 @@ static void flush_send_queue(struct cardstate *cs)* return value: * number of bytes queued, or error code < 0 */ -static int gigaset_write_cmd (struct cardstate *cs,const unsigned char *buf, -int len,struct tasklet_struct *wake_tasklet) +static int gigaset_write_cmd (struct cardstate *cs,struct cmdbuf_t *cb) { -struct cmdbuf_t *cb;unsigned long flags;gigaset_dbg_buffer (cs->mstate !=MS_LOCKED ?DEBUG_TRANSCMD :DEBUG_LOCKCMD , -"CMD Transmit" , len, buf); - -if (len <=0 ) -return 0 ; - - cb =kmalloc (sizeof (struct cmdbuf_t ) + len,GFP_ATOMIC ); -if (!cb) { -dev_err (cs->dev,"%s: out of memory!\n" , __func__); -return -ENOMEM ; - } - -memcpy (cb->buf, buf, len); - cb->len = len; - cb->offset =0 ; - cb->next =NULL ; - cb->wake_tasklet = wake_tasklet; +"CMD Transmit" , cb->len, cb->buf);spin_lock_irqsave (&cs->cmdlock, flags); cb->prev = cs->lastcmdbuf;
@@ -272,9 +255,9 @@ static int gigaset_write_cmd(struct cardstate *cs, const unsigned char *buf, cs->lastcmdbuf->next = cb; else { cs->cmdbuf = cb; - cs->curlen = len; + cs->curlen = cb->len; } - cs->cmdbytes += len; + cs->cmdbytes += cb->len; cs->lastcmdbuf = cb;spin_unlock_irqrestore (&cs->cmdlock, flags);
@@ -282,7 +265,7 @@ static int gigaset_write_cmd(struct cardstate *cs, const unsigned char *buf,if (cs->connected)tasklet_schedule (&cs->write_tasklet);spin_unlock_irqrestore (&cs->lock, flags); -return len; +return cb->len; }/*
drivers/isdn/gigaset/usb-gigaset.c +5 -21
@@ -494,29 +494,13 @@ static int send_cb(struct cardstate *cs, struct cmdbuf_t *cb) }/* Send command to device. */ -static int gigaset_write_cmd (struct cardstate *cs,const unsigned char *buf, -int len,struct tasklet_struct *wake_tasklet) +static int gigaset_write_cmd (struct cardstate *cs,struct cmdbuf_t *cb) { -struct cmdbuf_t *cb;unsigned long flags;gigaset_dbg_buffer (cs->mstate !=MS_LOCKED ?DEBUG_TRANSCMD :DEBUG_LOCKCMD , -"CMD Transmit" , len, buf); - -if (len <=0 ) -return 0 ; - cb =kmalloc (sizeof (struct cmdbuf_t ) + len,GFP_ATOMIC ); -if (!cb) { -dev_err (cs->dev,"%s: out of memory\n" , __func__); -return -ENOMEM ; - } - -memcpy (cb->buf, buf, len); - cb->len = len; - cb->offset =0 ; - cb->next =NULL ; - cb->wake_tasklet = wake_tasklet; +"CMD Transmit" , cb->len, cb->buf);spin_lock_irqsave (&cs->cmdlock, flags); cb->prev = cs->lastcmdbuf;
@@ -524,9 +508,9 @@ static int gigaset_write_cmd(struct cardstate *cs, const unsigned char *buf, cs->lastcmdbuf->next = cb; else { cs->cmdbuf = cb; - cs->curlen = len; + cs->curlen = cb->len; } - cs->cmdbytes += len; + cs->cmdbytes += cb->len; cs->lastcmdbuf = cb;spin_unlock_irqrestore (&cs->cmdlock, flags);
@@ -534,7 +518,7 @@ static int gigaset_write_cmd(struct cardstate *cs, const unsigned char *buf,if (cs->connected)tasklet_schedule (&cs->write_tasklet);spin_unlock_irqrestore (&cs->lock, flags); -return len; +return cb->len; }static int gigaset_write_room (struct cardstate *cs)
Signature · 1 line
1.6.5.3.298.g39add
PATCH 6/7 isdn/gigaset: ignore irrelevant device responses
In reply to a message not in the archiveDowngrade the Gigaset driver's reaction to unknown AT responses from the device from warning to debug level, and remove the handling of some device responses which aren't relevant for the driver's operation.
--- drivers/isdn/gigaset/ev-layer.c | 67 ++++++++------------------------------ drivers/isdn/gigaset/gigaset.h | 5 +-- 2 files changed, 16 insertions(+), 56 deletions(-)
drivers/isdn/gigaset/ev-layer.c +14 -53
@@ -35,53 +35,40 @@#define RT_RING 2#define RT_NUMBER 3#define RT_STRING 4 -#define RT_HEX 5#define RT_ZCAU 6/* Possible ASCII responses */ #define RSP_OK 0 -#define RSP_BUSY 1 -#define RSP_CONNECT 2 +#define RSP_ERROR 1#define RSP_ZGCI 3#define RSP_RING 4 -#define RSP_ZAOC 5 -#define RSP_ZCSTR 6 -#define RSP_ZCFGT 7 -#define RSP_ZCFG 8 -#define RSP_ZCCR 9 -#define RSP_EMPTY 10 -#define RSP_ZLOG 11 -#define RSP_ZCAU 12 -#define RSP_ZMWI 13 -#define RSP_ZABINFO 14 -#define RSP_ZSMLSTCHG 15 +#define RSP_ZVLS 5 +#define RSP_ZCAU 6 + +/* responses with values to store in at_state */ +/* - numeric */ #define RSP_VAR 100#define RSP_ZSAU (RSP_VAR + VAR_ZSAU)#define RSP_ZDLE (RSP_VAR + VAR_ZDLE) -#define RSP_ZVLS (RSP_VAR + VAR_ZVLS)#define RSP_ZCTP (RSP_VAR + VAR_ZCTP) +/* - string */ #define RSP_STR (RSP_VAR + VAR_NUM)#define RSP_NMBR (RSP_STR + STR_NMBR)#define RSP_ZCPN (RSP_STR + STR_ZCPN)#define RSP_ZCON (RSP_STR + STR_ZCON)#define RSP_ZBC (RSP_STR + STR_ZBC)#define RSP_ZHLC (RSP_STR + STR_ZHLC) -#define RSP_ERROR -1/* ERROR */ +#define RSP_WRONG_CID -2/* unknown cid in cmd */ -#define RSP_UNKNOWN -4/* unknown response */ -#define RSP_FAIL -5/* internal error */ #define RSP_INVAL -6/* invalid response */ +#define RSP_NODEV -9/* device not connected */ #define RSP_NONE -19#define RSP_STRING -20#define RSP_NULL -21 -#define RSP_RETRYFAIL -22 -#define RSP_RETRY -23 -#define RSP_SKIP -24#define RSP_INIT -27#define RSP_ANY -26#define RSP_LAST -28 -#define RSP_NODEV -9/* actions for process_response */ #define ACT_NOTHING 0
@@ -259,13 +246,6 @@ struct reply_t gigaset_tab_nocid[] =/* misc. */ {RSP_ERROR, -1, -1, -1, -1, -1, {ACT_ERROR} }, -{RSP_ZCFGT, -1, -1, -1, -1, -1, {ACT_DEBUG} }, -{RSP_ZCFG, -1, -1, -1, -1, -1, {ACT_DEBUG} }, -{RSP_ZLOG, -1, -1, -1, -1, -1, {ACT_DEBUG} }, -{RSP_ZMWI, -1, -1, -1, -1, -1, {ACT_DEBUG} }, -{RSP_ZABINFO, -1, -1, -1, -1, -1, {ACT_DEBUG} }, -{RSP_ZSMLSTCHG, -1, -1, -1, -1, -1, {ACT_DEBUG} }, - {RSP_ZCAU, -1, -1, -1, -1, -1, {ACT_ZCAU} }, {RSP_NONE, -1, -1, -1, -1, -1, {ACT_DEBUG} }, {RSP_ANY, -1, -1, -1, -1, -1, {ACT_WARN} },
@@ -363,10 +343,6 @@ struct reply_t gigaset_tab_cid[] =/* misc. */ {RSP_ZCON, -1, -1, -1, -1, -1, {ACT_DEBUG} }, -{RSP_ZCCR, -1, -1, -1, -1, -1, {ACT_DEBUG} }, -{RSP_ZAOC, -1, -1, -1, -1, -1, {ACT_DEBUG} }, -{RSP_ZCSTR, -1, -1, -1, -1, -1, {ACT_DEBUG} }, - {RSP_ZCAU, -1, -1, -1, -1, -1, {ACT_ZCAU} }, {RSP_NONE, -1, -1, -1, -1, -1, {ACT_DEBUG} }, {RSP_ANY, -1, -1, -1, -1, -1, {ACT_WARN} },
@@ -389,20 +365,11 @@ static const struct resp_type_t { {"ZVLS", RSP_ZVLS, RT_NUMBER}, {"ZCTP", RSP_ZCTP, RT_NUMBER}, {"ZDLE", RSP_ZDLE, RT_NUMBER}, - {"ZCFGT", RSP_ZCFGT, RT_NUMBER}, - {"ZCCR", RSP_ZCCR, RT_NUMBER}, - {"ZMWI", RSP_ZMWI, RT_NUMBER}, {"ZHLC", RSP_ZHLC, RT_STRING}, {"ZBC", RSP_ZBC, RT_STRING}, {"NMBR", RSP_NMBR, RT_STRING}, {"ZCPN", RSP_ZCPN, RT_STRING}, {"ZCON", RSP_ZCON, RT_STRING}, - {"ZAOC", RSP_ZAOC, RT_STRING}, - {"ZCSTR", RSP_ZCSTR, RT_STRING}, - {"ZCFG", RSP_ZCFG, RT_HEX}, - {"ZLOG", RSP_ZLOG, RT_NOTHING}, - {"ZABINFO", RSP_ZABINFO, RT_NOTHING}, - {"ZSMLSTCHG", RSP_ZSMLSTCHG, RT_NOTHING}, {NULL, 0, 0} };
@@ -590,10 +557,10 @@ void gigaset_handle_modem_response(struct cardstate *cs)break ;if (!rt->response) { - event->type =RSP_UNKNOWN ; -dev_warn (cs->dev, -"unknown modem response: %s\n" , - argv[curarg]); + event->type =RSP_NONE ; +gig_dbg (DEBUG_EVENT , +"unknown modem response: '%s'\n" , + argv[curarg]);break ; }
@@ -657,14 +624,8 @@ void gigaset_handle_modem_response(struct cardstate *cs) curarg = params -1 ;break ;case RT_NUMBER : -case RT_HEX :if (curarg < params) { -if (param_type ==RT_HEX ) - event->parameter = -isdn_gethex (argv[curarg]); -else - event->parameter = -isdn_getnum (argv[curarg]); + event->parameter =isdn_getnum (argv[curarg]); ++curarg; }else event->parameter =-1 ;
drivers/isdn/gigaset/gigaset.h +2 -3
@@ -198,9 +198,8 @@ void gigaset_dbg_buffer(enum debuglevel level, const unsigned char *msg,/* variables in struct at_state_t */ #define VAR_ZSAU 0#define VAR_ZDLE 1 -#define VAR_ZVLS 2 -#define VAR_ZCTP 3 -#define VAR_NUM 4 +#define VAR_ZCTP 2 +#define VAR_NUM 3#define STR_NMBR 0#define STR_ZCPN 1
Signature · 1 line
1.6.5.3.298.g39add
PATCH 7/7 isdn/gigaset: drop obsolete FIXME comment
In reply to a message not in the archiveDrop a FIXME comment with nothing left to fix.
Impact: cosmetic
--- drivers/isdn/gigaset/common.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/isdn/gigaset/common.c +0 -2
@@ -801,8 +801,6 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,spin_unlock_irqrestore (&cs->lock, flags);setup_timer (&cs->timer, timer_tick, (unsigned long ) cs); cs->timer.expires = jiffies +msecs_to_jiffies (GIG_TICK ); -/* FIXME: can jiffies increase too much until the timer is added? -* Same problem(?) with mod_timer() in timer_tick(). */ add_timer (&cs->timer);gig_dbg (DEBUG_INIT ,"cs initialized" );
Signature · 1 line
1.6.5.3.298.g39add
David Miller
maintainerFrom: Tilman Schmidt <[email protected]>
Date: Sun, 23 May 2010 02:24:12 +0200 (CEST)
Quoted 7 lines
Karsten, David,
following are seven patches to the CAPI subsystem and the Gigaset driver I'd like to see included in kernel release 2.6.35. The first three respond to user reports about an observed hang of the userspace command "capiinit stop".
The others are cleanups from the ongoing driver development.
What the heck about "no more cleanups or new features for networking" do you not understand?
When the merge window is openned, this is not a signal to you to send changes to me. You should have stuff in weeks ahead of that time.
I'm willing to take bug fixes only at this point so you'll need to respin this series.
And Tilman, of all people you really should know better.
Am 23.05.2010 02:43 schrieb David Miller:
Quoted 2 lines
What the heck about "no more cleanups or new features for networking" do you not understand?
Sorry, I must have missed the posting where you wrote this. I just came back from a short holiday to find ~5k unread postings in LKML, including the announcement of 2.6.34, and I guess I inadvertently deleted the message you're referring to above.
Quoted 2 lines
I'm willing to take bug fixes only at this point so you'll need to respin this series.
Will do.
Regards,
Tilman
Signature · 4 lines
Tilman Schmidt E-Mail: [email protected] Bonn, Germany Diese Nachricht besteht zu 100% aus wiederverwerteten Bits. Ungeöffnet mindestens haltbar bis: (siehe Rückseite)