From patchwork Tue Oct 25 12:15:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Einon X-Patchwork-Id: 121635 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 C18351007D9 for ; Tue, 25 Oct 2011 23:17:50 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756482Ab1JYMRa (ORCPT ); Tue, 25 Oct 2011 08:17:30 -0400 Received: from mail-ww0-f66.google.com ([74.125.82.66]:64369 "EHLO mail-ww0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756182Ab1JYMR2 (ORCPT ); Tue, 25 Oct 2011 08:17:28 -0400 Received: by wwf10 with SMTP id 10so89919wwf.1 for ; Tue, 25 Oct 2011 05:17:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:reply-to:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=tKrtXBYtgU8EwEMkfNZQFv1/XXylfxc5XQB9/TBcJO0=; b=LnGLfBwyYS7/Ice70uLemQu1/aBJ64v+ebmB5wM3nXqIFpxv/Qqw8LWOfbAk1fbrX6 ynZmpDhYJlkhSq1nv8jJ48rGALoGncUkgI9H60xUtpjJZ9bGlgKQ9EHEVDhVXGdh/RsY hJJZ/bUE9RRLAvBQ9SAfVicpmwJuH19iNBhEA= Received: by 10.216.134.80 with SMTP id r58mr5138585wei.63.1319545046599; Tue, 25 Oct 2011 05:17:26 -0700 (PDT) Received: from marke.airties ([87.115.199.157]) by mx.google.com with ESMTPS id a27sm14258435wbp.16.2011.10.25.05.17.24 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 25 Oct 2011 05:17:26 -0700 (PDT) Date: Tue, 25 Oct 2011 13:15:52 +0100 From: Mark Einon To: Stephen Rothwell Cc: Greg KH , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jiri Pirko , Ian Campbell , David Miller , netdev@vger.kernel.org, Mark Einon Subject: [PATCH] linux-next: et131x: Fixups due to merge issues from staging tree Message-ID: <20111025121551.GA2108@marke.airties> Reply-To: 20111025192636.f816c8860ee168a0a4756eda@canb.auug.org.au References: <20111025192636.f816c8860ee168a0a4756eda@canb.auug.org.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20111025192636.f816c8860ee168a0a4756eda@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Manually merged changes from commits afc4b13df143, bf3f1a6081aa and 5d6bcdfe38ce into et131x.c as identified in email below. Also removed dependency on NETDEV_1000 in Kconfig, which no longer exists. Greg: This patch should also be good for the staging tree. ---------------------------------------------------------- Date: Tue, 25 Oct 2011 19:26:36 +1100 From: Stephen Rothwell To: Greg KH Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jiri Pirko , Ian Campbell , David Miller , , Mark Einon Subject: linux-next: manual merge of the staging tree with the net-next tree Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/staging/et131x/et1310_tx.c drivers/staging/et131x/et131x_netdev.c between commits afc4b13df143 ("net: remove use of ndo_set_multicast_list in drivers"), bf3f1a6081aa ("et131x: convert to SKB paged frag API") and 5d6bcdfe38ce ("net: use DMA_x_DEVICE and dma_mapping_error with skb_frag_dma_map") from the net-next tree and commit d2796743cba2 ("staging: et131x: Put all .c files into one big file") from the staging tree. The latter removed these files, so I did that but more fixup is proably needed. ----------------------------------------------------------- Signed-off-by: Mark Einon --- drivers/staging/et131x/Kconfig | 2 +- drivers/staging/et131x/et131x.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/et131x/Kconfig b/drivers/staging/et131x/Kconfig index f0ed08d..9e1864c 100644 --- a/drivers/staging/et131x/Kconfig +++ b/drivers/staging/et131x/Kconfig @@ -1,6 +1,6 @@ config ET131X tristate "Agere ET-1310 Gigabit Ethernet support" - depends on NETDEV_1000 && PCI + depends on PCI default n ---help--- This driver supports Agere ET-1310 ethernet adapters. diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index 45b88d4..32c805b 100644 --- a/drivers/staging/et131x/et131x.c +++ b/drivers/staging/et131x/et131x.c @@ -3403,12 +3403,12 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb) * returned by dma_map_page() is always 32-bit * addressable (as defined by the pci/dma subsystem) */ - desc[frag++].addr_lo = - dma_map_page(&adapter->pdev->dev, - frags[i - 1].page, - frags[i - 1].page_offset, - frags[i - 1].size, - DMA_TO_DEVICE); + desc[frag++].addr_lo = skb_frag_dma_map( + &adapter->pdev->dev, + &frags[i - 1], + 0, + frags[i - 1].size, + DMA_TO_DEVICE); } } @@ -5233,7 +5233,7 @@ static const struct net_device_ops et131x_netdev_ops = { .ndo_open = et131x_open, .ndo_stop = et131x_close, .ndo_start_xmit = et131x_tx, - .ndo_set_multicast_list = et131x_multicast, + .ndo_set_rx_mode = et131x_multicast, .ndo_tx_timeout = et131x_tx_timeout, .ndo_change_mtu = et131x_change_mtu, .ndo_set_mac_address = et131x_set_mac_addr,