The patch titled
8139cp: remove gratuitous indirection
has been added to the -mm tree. Its filename is
8139cp-remove-gratuitous-indirection.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: 8139cp: remove gratuitous indirection
From: Francois Romieu <romieu@xxxxxxxxxxxxx>
dev is an argument of the current function.
Signed-off-by: Francois Romieu <romieu@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/8139cp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN drivers/net/8139cp.c~8139cp-remove-gratuitous-indirection drivers/net/8139cp.c
--- a/drivers/net/8139cp.c~8139cp-remove-gratuitous-indirection
+++ a/drivers/net/8139cp.c
@@ -571,7 +571,7 @@ rx_status_loop:
if (netif_msg_rx_status(cp))
printk(KERN_DEBUG "%s: rx slot %d status 0x%x len %d\n",
- cp->dev->name, rx_tail, status, len);
+ dev->name, rx_tail, status, len);
buflen = cp->rx_buf_sz + RX_OFFSET;
new_skb = dev_alloc_skb (buflen);
@@ -581,7 +581,7 @@ rx_status_loop:
}
skb_reserve(new_skb, RX_OFFSET);
- new_skb->dev = cp->dev;
+ new_skb->dev = dev;
pci_unmap_single(cp->pdev, mapping,
buflen, PCI_DMA_FROMDEVICE);
_
Patches currently in -mm which might be from romieu@xxxxxxxxxxxxx are
8139cp-trim-ring_info.patch
8139cp-remove-gratuitous-indirection.patch
8139cp-ring_info-removal-for-the-receive-path.patch
8139cp-sync-the-device-private-data-with-its-r8169-counterpart.patch
8139cp-removal-of-useless-bug_on-check.patch
8139cp-pci_get_drvdatapdev-can-not-be-null-in-suspend-handler.patch
8139cp-use-pci_device-to-shorten-the-pci-device-table.patch
git-r8169.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
