From patchwork Fri Feb 3 14:36:20 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: 139387 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 C647A104796 for ; Sat, 4 Feb 2012 01:36:51 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756715Ab2BCOgl (ORCPT ); Fri, 3 Feb 2012 09:36:41 -0500 Received: from mail-lpp01m010-f46.google.com ([209.85.215.46]:60859 "EHLO mail-lpp01m010-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756714Ab2BCOgj (ORCPT ); Fri, 3 Feb 2012 09:36:39 -0500 Received: by lagu2 with SMTP id u2so1877414lag.19 for ; Fri, 03 Feb 2012 06:36:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=lpyi5ddY0Ye5kh+clELLLrznrzL9fYnfXrAPj2M/OF8=; b=vOv7XA1n6iCpkUfnXPGQQSKT4PgmGFRafo0ws04WQ5WE8H/2nmKYtq4l3gOls8yMhU bwYNtSvW6SbZqZiQ1I2/6a6wD62d6kaSl2VziX/PBOQWtwBwKqwcsR2B613DOo+JNBL8 O5m+7hraOzwWW7VQQmggUuPBFbn20n6FDtQjc= Received: by 10.152.109.135 with SMTP id hs7mr3844112lab.14.1328279797702; Fri, 03 Feb 2012 06:36:37 -0800 (PST) Received: from localhost.localdomain ([212.4.57.94]) by mx.google.com with ESMTPS id od2sm3870556lab.11.2012.02.03.06.36.36 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 03 Feb 2012 06:36:36 -0800 (PST) From: =?UTF-8?q?Sjur=20Br=C3=A6ndeland?= To: netdev@vger.kernel.org, davem@davemloft.net Cc: sjurbren@gmail.com, =?UTF-8?q?Sjur=20Br=C3=A6ndeland?= Subject: [PATCH 2/3] caif: Add drop count for caif_net device. Date: Fri, 3 Feb 2012 15:36:20 +0100 Message-Id: <1328279781-4745-2-git-send-email-sjur.brandeland@stericsson.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1328279781-4745-1-git-send-email-sjur.brandeland@stericsson.com> References: <1328279781-4745-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 Count dropped packets in CAIF Netdevice. Signed-off-by: Sjur Brændeland --- net/caif/chnl_net.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c index 8656909..a751d9b 100644 --- a/net/caif/chnl_net.c +++ b/net/caif/chnl_net.c @@ -74,7 +74,6 @@ static int chnl_recv_cb(struct cflayer *layr, struct cfpkt *pkt) struct sk_buff *skb; struct chnl_net *priv = container_of(layr, struct chnl_net, chnl); int pktlen; - int err = 0; const u8 *ip_version; u8 buf; @@ -95,8 +94,7 @@ static int chnl_recv_cb(struct cflayer *layr, struct cfpkt *pkt) /* check the version of IP */ ip_version = skb_header_pointer(skb, 0, 1, &buf); - if (!ip_version) - return -EINVAL; + switch (*ip_version >> 4) { case 4: skb->protocol = htons(ETH_P_IP); @@ -105,6 +103,7 @@ static int chnl_recv_cb(struct cflayer *layr, struct cfpkt *pkt) skb->protocol = htons(ETH_P_IPV6); break; default: + priv->netdev->stats.rx_errors++; return -EINVAL; } @@ -123,7 +122,7 @@ static int chnl_recv_cb(struct cflayer *layr, struct cfpkt *pkt) priv->netdev->stats.rx_packets++; priv->netdev->stats.rx_bytes += pktlen; - return err; + return 0; } static int delete_device(struct chnl_net *dev) @@ -221,11 +220,13 @@ static int chnl_net_start_xmit(struct sk_buff *skb, struct net_device *dev) if (skb->len > priv->netdev->mtu) { pr_warn("Size of skb exceeded MTU\n"); + dev->stats.tx_errors++; return -ENOSPC; } if (!priv->flowenabled) { pr_debug("dropping packets flow off\n"); + dev->stats.tx_dropped++; return NETDEV_TX_BUSY; } @@ -240,8 +241,7 @@ static int chnl_net_start_xmit(struct sk_buff *skb, struct net_device *dev) /* Send the packet down the stack. */ result = priv->chnl.dn->transmit(priv->chnl.dn, pkt); if (result) { - if (result == -EAGAIN) - result = NETDEV_TX_BUSY; + dev->stats.tx_dropped++; return result; }