From patchwork Sun Jun 24 21:01:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: sjur.brandeland@stericsson.com X-Patchwork-Id: 166906 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 F0619B6FA2 for ; Mon, 25 Jun 2012 07:01:54 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753549Ab2FXVBu (ORCPT ); Sun, 24 Jun 2012 17:01:50 -0400 Received: from mail-lb0-f174.google.com ([209.85.217.174]:65158 "EHLO mail-lb0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752328Ab2FXVBs (ORCPT ); Sun, 24 Jun 2012 17:01:48 -0400 Received: by lbbgm6 with SMTP id gm6so5685479lbb.19 for ; Sun, 24 Jun 2012 14:01:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=Gblom4GfbB9bS9KjjgPAbrEoA7GyLOxczqm5FSPpOsI=; b=j2yO02EU4Q3KKGbgdd2kpS1632XIaCy+eTKXIxP3XyxfL5Yp1ugquBy6KXKXMl2jBt C+L944QeV0J6N+cnQJdf/+7NNkrVO/Z2oxazUEVjZXFGuZPKHPJWJJnmVGHYhRejGzgP NzrIsA0iX5gwNry++nccsRRGKSU2CkEjhvLwatj0zsmwM0ZBKHjTuZ/MWtf8QGpi8xSg gJkw+fMs21Chh507W56Rrr62VTjpAku3giPIx7uqlNXEn6M3rFV1gsL0qGo27u/znYs1 6QjWrxnA2rSNzqfkBKgcyUlpd3rPnklodZAjpQrBmoaHg5SxjRIxDUGeKaYYrw7Zh1qY IMCg== Received: by 10.112.102.136 with SMTP id fo8mr4840864lbb.106.1340571706684; Sun, 24 Jun 2012 14:01:46 -0700 (PDT) Received: from sjur-laptop.stericsson.local ([212.4.57.94]) by mx.google.com with ESMTPS id er3sm4744985lbb.16.2012.06.24.14.01.45 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 24 Jun 2012 14:01:46 -0700 (PDT) From: sjur.brandeland@stericsson.com To: davem@davemloft.net Cc: netdev@vger.kernel.org, sjurbren@gmail.com, Per Ellefsen , Per Ellefsen , =?UTF-8?q?Sjur=20Br=C3=A6ndeland?= Subject: [net 2/3] caif-hsi: Bugfix - Piggyback'ed embedded CAIF frame lost Date: Sun, 24 Jun 2012 23:01:37 +0200 Message-Id: <1340571698-17892-2-git-send-email-sjur.brandeland@stericsson.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1340571698-17892-1-git-send-email-sjur.brandeland@stericsson.com> References: <1340571698-17892-1-git-send-email-sjur.brandeland@stericsson.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Per Ellefsen When receiving a piggyback'ed descriptor containing an embedded frame, but no payload, the embedded frame was lost. Signed-off-by: Per Ellefsen Signed-off-by: Sjur Brændeland --- drivers/net/caif/caif_hsi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c index 1520814..1f52ff3 100644 --- a/drivers/net/caif/caif_hsi.c +++ b/drivers/net/caif/caif_hsi.c @@ -693,8 +693,6 @@ static void cfhsi_rx_done(struct cfhsi *cfhsi) */ memcpy(rx_buf, (u8 *)piggy_desc, CFHSI_DESC_SHORT_SZ); - /* Mark no embedded frame here */ - piggy_desc->offset = 0; if (desc_pld_len == -EPROTO) goto out_of_sync; } @@ -737,6 +735,8 @@ static void cfhsi_rx_done(struct cfhsi *cfhsi) /* Extract any payload in piggyback descriptor. */ if (cfhsi_rx_desc(piggy_desc, cfhsi) < 0) goto out_of_sync; + /* Mark no embedded frame after extracting it */ + piggy_desc->offset = 0; } }