From patchwork Sun Jul 10 18:49:26 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matvejchikov Ilya X-Patchwork-Id: 104078 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 7AEDCB7090 for ; Mon, 11 Jul 2011 04:49:52 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756503Ab1GJStr (ORCPT ); Sun, 10 Jul 2011 14:49:47 -0400 Received: from mail-qy0-f174.google.com ([209.85.216.174]:36043 "EHLO mail-qy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756483Ab1GJStr (ORCPT ); Sun, 10 Jul 2011 14:49:47 -0400 Received: by qyk29 with SMTP id 29so1043033qyk.19 for ; Sun, 10 Jul 2011 11:49:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:reply-to:in-reply-to:references:from:date:message-id :subject:to:cc:content-type; bh=St7APmSuGioQu1Hj35Ud1raT63bGhJ+Tnt3NXWyFMxQ=; b=bAbAHVlbi1eDMQv/bYkEESD6IGofwRnYYlo49RrMXziQZp9vS/V2irDseewTFwpSjX dhUREStdk8kKpEPzhZ81jHu/KMyoljVfdvTt5eXHZso8S5alM5N4wbcJG7caRSWmHRIe 4kTtHG83DW6Hr3yyLrUZWUVMMIenJUIYO0yEE= Received: by 10.229.134.199 with SMTP id k7mr2977459qct.171.1310323786142; Sun, 10 Jul 2011 11:49:46 -0700 (PDT) MIME-Version: 1.0 Received: by 10.229.5.132 with HTTP; Sun, 10 Jul 2011 11:49:26 -0700 (PDT) Reply-To: matvejchikov@gmail.com In-Reply-To: <20110710.113741.2147626275846755476.davem@davemloft.net> References: <20110710.113741.2147626275846755476.davem@davemloft.net> From: Matvejchikov Ilya Date: Sun, 10 Jul 2011 22:49:26 +0400 Message-ID: Subject: Re: [PATCH] slip: fix wrong SLIP6 ifdef-endif placing To: David Miller Cc: netdev@vger.kernel.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org SLIP6 have nothing to do with CSLIP so placing a block of SLIP6-related code within a CSLIP ifdef-endif block is incorrect. Signed-off-by: Ilya Matvejchikov --- drivers/net/slip.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/slip.c b/drivers/net/slip.c index 8ec1a9a..2f110fb 100644 --- a/drivers/net/slip.c +++ b/drivers/net/slip.c @@ -182,11 +182,11 @@ static int sl_alloc_bufs(struct slip *sl, int mtu) #ifdef SL_INCLUDE_CSLIP cbuff = xchg(&sl->cbuff, cbuff); slcomp = xchg(&sl->slcomp, slcomp); +#endif #ifdef CONFIG_SLIP_MODE_SLIP6 sl->xdata = 0; sl->xbits = 0; #endif -#endif spin_unlock_bh(&sl->lock); err = 0;