From patchwork Tue Jul 10 00:09:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 169995 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 9220C2C0205 for ; Tue, 10 Jul 2012 10:09:53 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755212Ab2GJAJv (ORCPT ); Mon, 9 Jul 2012 20:09:51 -0400 Received: from mail-gg0-f174.google.com ([209.85.161.174]:42042 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755167Ab2GJAJu (ORCPT ); Mon, 9 Jul 2012 20:09:50 -0400 Received: by gglu4 with SMTP id u4so10719391ggl.19 for ; Mon, 09 Jul 2012 17:09:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=9CFgEfgsE8iKdFPs04eXGUrWeKWKYazImqtZk//qW0I=; b=YdLZL4v1pyQ7EkKtF2w2xAjajXuAWK2bFuR7HAaf+8JHPX1alfA5xwNvmySll585dP 6VtTvSUQ4J5UQP2NS8p7X3l5D9oVLa7YaKUhFlMN1OXV8GmoUTVepzezk6yM+KVdb6c2 3NQ2qD1tYzk1pV86kx8qc0gcqCtE2isvDg9cmJ3mNFvUtpXZ1LxEADzoB4lAOjMB53VC qHu8jkIXYBZdTHLFU9z6ZynwUlLMdw8bfJX6RO2oqDSr29qLrOzWst9tcNSQxDjQCXKU 5frZ8+bbSgVXGNerO6i0fAl+P26LyT98lk2RqJy9XuGsuUxSYW1hDIe/jxpawNNQUz3F YRmg== Received: by 10.66.72.225 with SMTP id g1mr69841666pav.3.1341878989307; Mon, 09 Jul 2012 17:09:49 -0700 (PDT) Received: from scylla (184-98-21-173.phnx.qwest.net. [184.98.21.173]) by mx.google.com with ESMTPS id ot4sm28631410pbb.65.2012.07.09.17.09.46 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 09 Jul 2012 17:09:48 -0700 (PDT) Received: by scylla (sSMTP sendmail emulation); Mon, 09 Jul 2012 17:10:21 -0700 From: Jon Mason To: "David S. Miller" Cc: netdev@vger.kernel.org Subject: [PATCH 10/11] sunhme: remove unnecessary setting of skb->dev Date: Mon, 9 Jul 2012 17:09:34 -0700 Message-Id: <1341878975-10577-10-git-send-email-jdmason@kudzu.us> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1341878975-10577-1-git-send-email-jdmason@kudzu.us> References: <1341878975-10577-1-git-send-email-jdmason@kudzu.us> X-Gm-Message-State: ALoCoQkY99GlDo9wYfRbXO83tQA+apsRfmuc1yJUlAiRmdvlNzhagWFWdFclXRlZU9FbC3LdZHNA Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org skb->dev is being unnecessarily set during ring init and skb alloc in rx. It is already being set to the proper value when eth_type_trans is called on packet receive, and the skb->dev is not referenced anywhere else in the code. Signed-off-by: Jon Mason --- drivers/net/ethernet/sun/sunhme.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c index dfc00c4..73f341b 100644 --- a/drivers/net/ethernet/sun/sunhme.c +++ b/drivers/net/ethernet/sun/sunhme.c @@ -1249,7 +1249,6 @@ static void happy_meal_clean_rings(struct happy_meal *hp) static void happy_meal_init_rings(struct happy_meal *hp) { struct hmeal_init_block *hb = hp->happy_block; - struct net_device *dev = hp->dev; int i; HMD(("happy_meal_init_rings: counters to zero, ")); @@ -1270,7 +1269,6 @@ static void happy_meal_init_rings(struct happy_meal *hp) continue; } hp->rx_skbs[i] = skb; - skb->dev = dev; /* Because we reserve afterwards. */ skb_put(skb, (ETH_FRAME_LEN + RX_OFFSET + 4)); @@ -2031,7 +2029,6 @@ static void happy_meal_rx(struct happy_meal *hp, struct net_device *dev) } dma_unmap_single(hp->dma_dev, dma_addr, RX_BUF_ALLOC_SIZE, DMA_FROM_DEVICE); hp->rx_skbs[elem] = new_skb; - new_skb->dev = dev; skb_put(new_skb, (ETH_FRAME_LEN + RX_OFFSET + 4)); hme_write_rxd(hp, this, (RXFLAG_OWN|((RX_BUF_ALLOC_SIZE-RX_OFFSET)<<16)),