From patchwork Sat Aug 15 13:41:07 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: roel kluin X-Patchwork-Id: 31471 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id D8862B6F1F for ; Sat, 15 Aug 2009 23:37:07 +1000 (EST) Received: by ozlabs.org (Postfix) id C9144DDD0B; Sat, 15 Aug 2009 23:37:07 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 4A780DDD1B for ; Sat, 15 Aug 2009 23:37:07 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754234AbZHONgz (ORCPT ); Sat, 15 Aug 2009 09:36:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753120AbZHONgz (ORCPT ); Sat, 15 Aug 2009 09:36:55 -0400 Received: from ey-out-2122.google.com ([74.125.78.27]:13891 "EHLO ey-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752201AbZHONgy (ORCPT ); Sat, 15 Aug 2009 09:36:54 -0400 Received: by ey-out-2122.google.com with SMTP id 22so451600eye.37 for ; Sat, 15 Aug 2009 06:36:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :content-type:content-transfer-encoding; bh=KXjqt6jH8XeBqqlafgZbbqbDoB9hxlzU7zSgY5etupg=; b=lN2ezmeV5MwdB/0DmLmOqu1w80mzp9bjumKu4A+E3Fuk4y9nugTsQynm6fTDLL3KBJ QqrWSTY91XSkRLAmNKfFmpKR9bOwT7AixuUfQ5iwicTecOgyypNFhmcALsvWeAMq3x/U HYgcP04S1dXajGB9TTkCnLocuvJWbm+1wcpJc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; b=d8/GLLb65uc2TDKormLqTqXeEltmcCJiKnGlcfZj5E7ddlQOr9v1rWI7Rs++8C9s+4 mftgwFEymCT2QFUQbOz0lwZDtdlgof+BcfTv0nGBx7daCaUhdHiPN80VwSnM0HFC3KnV ACLjkrbeFXyrZ3KzN2oopp6XTFzYU7LwH+Yiw= Received: by 10.210.116.17 with SMTP id o17mr4560044ebc.33.1250343414491; Sat, 15 Aug 2009 06:36:54 -0700 (PDT) Received: from zoinx.mars (d133062.upc-d.chello.nl [213.46.133.62]) by mx.google.com with ESMTPS id 28sm6966492eye.54.2009.08.15.06.36.53 (version=SSLv3 cipher=RC4-MD5); Sat, 15 Aug 2009 06:36:53 -0700 (PDT) Message-ID: <4A86BAF3.5060609@gmail.com> Date: Sat, 15 Aug 2009 15:41:07 +0200 From: Roel Kluin User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.1) Gecko/20090814 Fedora/3.0-2.6.b3.fc11 Thunderbird/3.0b3 MIME-Version: 1.0 To: Andrew Morton CC: David Miller , romieu@fr.zoreil.com, netdev@vger.kernel.org Subject: Re: [PATCH] WAN: bit and/or confusion References: <4A855DE2.2000907@gmail.com> <20090814163644.0cc8974f.akpm@linux-foundation.org> <20090814.164123.36875657.davem@davemloft.net> <20090814165852.7338461e.akpm@linux-foundation.org> In-Reply-To: <20090814165852.7338461e.akpm@linux-foundation.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix the tests that check whether Frame* bits are not set Signed-off-by: Roel Kluin --- > we need > > else if (!(skb->data[pkt_len] & FrameCrc)) > vfr is "valid frame". 0 is invalid. > > rab is "receive message aborted". The data sheet doesn't actually say > if the bit is active-high or active-low (grr). Maybe someone could test this? -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c index 8face5d..b686050 100644 --- a/drivers/net/wan/dscc4.c +++ b/drivers/net/wan/dscc4.c @@ -663,9 +663,9 @@ static inline void dscc4_rx_skb(struct dscc4_dev_priv *dpriv, } else { if (skb->data[pkt_len] & FrameRdo) dev->stats.rx_fifo_errors++; - else if (!(skb->data[pkt_len] | ~FrameCrc)) + else if (!(skb->data[pkt_len] & FrameCrc)) dev->stats.rx_crc_errors++; - else if (!(skb->data[pkt_len] | ~(FrameVfr | FrameRab))) + else if (!(skb->data[pkt_len] & (FrameVfr | FrameRab))) dev->stats.rx_length_errors++; else dev->stats.rx_errors++;