netdev - linux-next: manual merge of the staging tree with the net tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20111006160433.44de2a1374b6ec4efc97e04e@canb.auug.org.au>
Date:	Thu, 6 Oct 2011 16:04:33 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Ian Campbell <Ian.Campbell@...rix.com>,
	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>,
	Mark Einon <mark.einon@...il.com>
Subject: linux-next: manual merge of the staging tree with the net tree

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/et131x/et1310_tx.c between commit bf3f1a6081aa ("et131x:
convert to SKB paged frag API") from the net tree and commit 10f00a49b048
("staging: et131x: Rename var name 'etdev' to 'adapter' throughout
module") from the staging tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/staging/et131x/et1310_tx.c
index 03e7a4e,2ecb934..0000000
--- a/drivers/staging/et131x/et1310_tx.c
+++ b/drivers/staging/et131x/et1310_tx.c
@@@ -519,12 -392,12 +392,12 @@@ static int nic_send_packet(struct et131
  			 * returned by pci_map_page() is always 32-bit
  			 * addressable (as defined by the pci/dma subsystem)
  			 */
 -			desc[frag++].addr_lo =
 -			    pci_map_page(adapter->pdev,
 -					 frags[i - 1].page,
 -					 frags[i - 1].page_offset,
 -					 frags[i - 1].size,
 -					 PCI_DMA_TODEVICE);
 +			desc[frag++].addr_lo = skb_frag_dma_map(
- 							&etdev->pdev->dev,
++							&adapter->pdev->dev,
 +							&frags[i - 1],
 +							0,
 +							frags[i - 1].size,
 +							PCI_DMA_TODEVICE);
  		}
  	}
  

Content of type "application/pgp-signature" skipped