From patchwork Thu Jul 22 11:11:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 59563 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8E1D51007D3 for ; Thu, 22 Jul 2010 21:12:58 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759250Ab0GVLMT (ORCPT ); Thu, 22 Jul 2010 07:12:19 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:61902 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759246Ab0GVLMQ (ORCPT ); Thu, 22 Jul 2010 07:12:16 -0400 Received: by fxm14 with SMTP id 14so4184059fxm.19 for ; Thu, 22 Jul 2010 04:12:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=ytnCIucUslGwYsz3cGMYtCfFTOuPmCBTNUGNp9jb6Ww=; b=EIZv1pc02MOtLlGPAkmhkOf5hi/6hGrUgnI8IjbYgdMH/rJn3tguQhwxsnCnEC/PRf xv8wta5bxLyTUYFj4NpuEL2lvhatN2u/82AcM6sNk0ewA32A8nAwy1+FhdyzCi0B6M5G Qw1LQz9sD47/alsibwigWUNBco0oqR4PSdKQ4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=w4Rl7ffMVmD8/xJBVAqCDSUmVtMwIZXocTKabDzFFJnsyZwwvF9LP+RG9e+vXVBHtq AIPu8vajZXu2H8mdscLGI70i09gDxxMRkb2fwOJGO8mytpPpBdWyL12s7TDoAklw0FnY XunO7W91FSXL35GH6bjZhzpEGAmUJoDWbbrCg= Received: by 10.223.107.211 with SMTP id c19mr1699461fap.20.1279797134208; Thu, 22 Jul 2010 04:12:14 -0700 (PDT) Received: from bicker ([205.177.176.130]) by mx.google.com with ESMTPS id r5sm3278899faq.32.2010.07.22.04.12.04 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 22 Jul 2010 04:12:13 -0700 (PDT) Date: Thu, 22 Jul 2010 13:11:31 +0200 From: Dan Carpenter To: SjurBraendeland@stericsson.com Cc: "David S. Miller" , Sjur Braendeland , netdev@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch -next] caif: precedence bug Message-ID: <20100722111131.GB17585@bicker> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Negate has precedence over comparison so the original assert only checked that "rfml->fragment_size" was larger than 1 or 0. Signed-off-by: Dan Carpenter --- 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/net/caif/cfrfml.c b/net/caif/cfrfml.c index 4b04d25..eb16020 100644 --- a/net/caif/cfrfml.c +++ b/net/caif/cfrfml.c @@ -193,7 +193,7 @@ out: static int cfrfml_transmit_segment(struct cfrfml *rfml, struct cfpkt *pkt) { - caif_assert(!cfpkt_getlen(pkt) < rfml->fragment_size); + caif_assert(cfpkt_getlen(pkt) >= rfml->fragment_size); /* Add info for MUX-layer to route the packet out. */ cfpkt_info(pkt)->channel_id = rfml->serv.layer.id;