The patch titled
git-net: fix pasemi_mac
has been added to the -mm tree. Its filename is
git-net-fix-pasemi_mac.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: git-net: fix pasemi_mac
From: Kamalesh Babulal <kamalesh@xxxxxxxxxxxxxxxxxx>
drivers/net/pasemi_mac.c: In function â??pasemi_mac_probeâ??:
drivers/net/pasemi_mac.c:1153: error: conflicting types for â??macâ??
drivers/net/pasemi_mac.c:1151: error: previous declaration of â??macâ?? was here
drivers/net/pasemi_mac.c:1170: error: incompatible types in assignment
drivers/net/pasemi_mac.c:1172: error: request for member â??pdevâ?? in
something not a structure or union
In the function
static int __devinit
pasemi_mac_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{
<snip>
struct pasemi_mac *mac;
int err;
DECLARE_MAC_BUF(mac);
introduction of mac as var [18] triggers the build failure, so in the below
patch renaming mac as mac_buf is done, because it is used to print the mac
address using the newly introduced print_mac function.
Signed-off-by: Kamalesh Babulal <kamalesh@xxxxxxxxxxxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/pasemi_mac.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff -puN drivers/net/pasemi_mac.c~git-net-fix-pasemi_mac drivers/net/pasemi_mac.c
--- a/drivers/net/pasemi_mac.c~git-net-fix-pasemi_mac
+++ a/drivers/net/pasemi_mac.c
@@ -1150,7 +1150,7 @@ pasemi_mac_probe(struct pci_dev *pdev, c
struct net_device *dev;
struct pasemi_mac *mac;
int err;
- DECLARE_MAC_BUF(mac);
+ DECLARE_MAC_BUF(mac_buf);
err = pci_enable_device(pdev);
if (err)
@@ -1236,7 +1236,7 @@ pasemi_mac_probe(struct pci_dev *pdev, c
"hw addr %s\n",
dev->name, mac->type == MAC_TYPE_GMAC ? "GMAC" : "XAUI",
mac->dma_if, mac->dma_txch, mac->dma_rxch,
- print_mac(mac, dev->dev_addr));
+ print_mac(mac_buf, dev->dev_addr));
return err;
_
Patches currently in -mm which might be from kamalesh@xxxxxxxxxxxxxxxxxx are
fix-3-gregkh-driver-kobject-remove-the-static-array-for-the-name.patch
git-net-fix-macec.patch
git-net-fix-pasemi_mac.patch
git-block-ps3disk-fix.patch
memoryless-nodes-fixup-uses-of-node_online_map-in-generic-code-fix.patch
use-extended-crashkernel-command-line-on-ia64-fix.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
