From 39dbbf327ad6363268e107d848e8e3984159f23b Mon Sep 17 00:00:00 2001 From: Tilman Schmidt Date: Wed, 13 May 2009 12:44:18 +0000 Subject: [PATCH] --- yaml --- r: 150231 b: refs/heads/master c: 0a305720ee597aad41af61e6b6844321d3e24251 h: refs/heads/master i: 150229: 1fb676470675dd5028180137b44287b992fb8135 150227: dc273f0923aec01268467102a3fe41d803d643ae 150223: fea9eedac3a6e4dd82dd39da333492670dcc3b59 v: v3 --- [refs] | 2 +- trunk/drivers/isdn/gigaset/asyncdata.c | 5 ++--- trunk/drivers/isdn/gigaset/common.c | 2 -- trunk/drivers/isdn/gigaset/gigaset.h | 1 - 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 1948b9daac67..4050b13cc3d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b88bd95655c7bc059606529e01467594978d7b72 +refs/heads/master: 0a305720ee597aad41af61e6b6844321d3e24251 diff --git a/trunk/drivers/isdn/gigaset/asyncdata.c b/trunk/drivers/isdn/gigaset/asyncdata.c index 2a4ce96f04bd..234cc5d53312 100644 --- a/trunk/drivers/isdn/gigaset/asyncdata.c +++ b/trunk/drivers/isdn/gigaset/asyncdata.c @@ -174,9 +174,8 @@ static inline int hdlc_loop(unsigned char c, unsigned char *src, int numbytes, if (unlikely(fcs != PPP_GOODFCS)) { dev_err(cs->dev, - "Packet checksum at %lu failed, " - "packet is corrupted (%u bytes)!\n", - bcs->rcvbytes, skb->len); + "Checksum failed, %u bytes corrupted!\n", + skb->len); compskb = NULL; gigaset_rcv_error(compskb, cs, bcs); error = 1; diff --git a/trunk/drivers/isdn/gigaset/common.c b/trunk/drivers/isdn/gigaset/common.c index 79c9b0f40f4b..e4141bf8b2f3 100644 --- a/trunk/drivers/isdn/gigaset/common.c +++ b/trunk/drivers/isdn/gigaset/common.c @@ -565,8 +565,6 @@ static struct bc_state *gigaset_initbcs(struct bc_state *bcs, gig_dbg(DEBUG_INIT, "setting up bcs[%d]->at_state", channel); gigaset_at_init(&bcs->at_state, bcs, cs, -1); - bcs->rcvbytes = 0; - #ifdef CONFIG_GIGASET_DEBUG bcs->emptycount = 0; #endif diff --git a/trunk/drivers/isdn/gigaset/gigaset.h b/trunk/drivers/isdn/gigaset/gigaset.h index d5f0110a8dfa..a2f6125739eb 100644 --- a/trunk/drivers/isdn/gigaset/gigaset.h +++ b/trunk/drivers/isdn/gigaset/gigaset.h @@ -384,7 +384,6 @@ struct bc_state { int trans_up; /* Counter of packages (upstream) */ struct at_state_t at_state; - unsigned long rcvbytes; __u16 fcs; struct sk_buff *skb;