Messages in this thread | | | Date | Tue, 06 Jul 2010 10:14:53 +0200 | From | Tilman Schmidt <> | Subject | Re: [PATCH 05/11] isdn/gigaset: improve CAPI message debugging |
| |
Am 2010-07-06 04:23 schrieb David Miller: > From: Tilman Schmidt <tilman@imap.cc> > Date: Tue, 6 Jul 2010 02:18:59 +0200 (CEST) > >> @@ -384,7 +388,7 @@ void gigaset_skb_sent(struct bc_state *bcs, struct sk_buff *dskb) >> >> /* don't send further B3 messages if disconnected */ >> if (bcs->apconnstate < APCONN_ACTIVE) { >> - gig_dbg(DEBUG_LLDATA, "disconnected, discarding ack"); >> + gig_dbg(DEBUG_MCMD, "disconnected, discarding ack"); >> return; >> } > > This is against something other than net-next-2.6 even with your > other two ISDN patches applied, because all of these lines read > "if (ap->connected ..." > > Please tell me what exactly these patches are against so that I > can apply them to net-next-2.6 cleanly.
They are against mainline and apply cleanly to v2.6.35-rc3. IOW, they go on top of the series you applied to net-2.6 on Fri, 25 Jun 2010 21:31:28 -0700 (PDT).
Specifically, the last patch of that series, > Subject: [PATCH 5/5] isdn/gigaset: correct CAPI connection state storage makes the switch from ap->connected to bcs->apconnstate.
So if you'll postpone applying last night's series until after your next merge of net-2.6 into net-next-2.6, it should then apply cleanly.
Thanks, Tilman
[unhandled content-type:application/pgp-signature] | |