The patch titled
git-net: fix a compile problem in macb.c
has been added to the -mm tree. Its filename is
git-net-fix-a-compile-problem-in-macbc.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 a compile problem in macb.c
From: Hans J. Koch <hjk@xxxxxxxxxxxxx>
Compiling macb.c fails because the type of parameter 2 of macb_poll()
was changed from int* to int. Furthermore, a local variable was removed
but was still used inside the function. This patch fixes it.
Signed-off-by: Hans J. Koch <hjk@xxxxxxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
diff -puN drivers/net/macb.c~git-net-fix-a-compile-problem-in-macbc drivers/net/macb.c
--- a/drivers/net/macb.c~git-net-fix-a-compile-problem-in-macbc
+++ a/drivers/net/macb.c
@@ -492,7 +492,7 @@ static int macb_poll(struct napi_struct
}
dev_dbg(&bp->pdev->dev, "poll: status = %08lx, budget = %d\n",
- (unsigned long)status, *budget);
+ (unsigned long)status, budget);
if (!(status & MACB_BIT(REC))) {
dev_warn(&bp->pdev->dev,
@@ -503,7 +503,7 @@ static int macb_poll(struct napi_struct
}
work_done = macb_rx(bp, budget);
- if (work_done < orig_budget)
+ if (work_done < budget)
netif_rx_complete(dev, napi);
/*
_
Patches currently in -mm which might be from hjk@xxxxxxxxxxxxx are
git-dvb.patch
git-hwmon.patch
git-net-fix-a-compile-problem-in-macbc.patch
pxafb-add-support-for-other-palette-formats.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
