From: Paul Mackerras <paulus@samba.org>
To: jgarzik@pobox.com
Cc: linux-kernel@vger.kernel.org, benh@kernel.crashing.org
Subject: [PATCH] update BMAC and MACE ethernet drivers
Date: Thu, 7 Nov 2002 15:34:44 +1100 [thread overview]
Message-ID: <15817.60772.305789.777076@argo.ozlabs.ibm.com> (raw)
The patch below contains some minor updates to the bmac and mace
ethernet drivers used on powermacs. The bmac.c change is just to
remove some compile warnings. The mace.c change is to move an inline
function definition to before the point where it is used.
Jeff, will you forward this to Linus or should I?
Thanks,
Paul.
diff -urN linux-2.5/drivers/net/bmac.c pmac-2.5/drivers/net/bmac.c
--- linux-2.5/drivers/net/bmac.c 2002-11-06 23:10:51.000000000 +1100
+++ pmac-2.5/drivers/net/bmac.c 2002-11-07 08:43:00.000000000 +1100
@@ -25,10 +25,10 @@
#include <asm/pgtable.h>
#include <asm/machdep.h>
#include <asm/pmac_feature.h>
+#include <asm/irq.h>
#ifdef CONFIG_PMAC_PBOOK
#include <linux/adb.h>
#include <linux/pmu.h>
-#include <asm/irq.h>
#endif
#include "bmac.h"
@@ -1053,7 +1053,7 @@
{
struct dev_mc_list *dmi = dev->mc_list;
char *addrs;
- int i, j, bit, byte;
+ int i;
unsigned short rx_cfg;
u32 crc;
diff -urN linux-2.5/drivers/net/mace.c pmac-2.5/drivers/net/mace.c
--- linux-2.5/drivers/net/mace.c 2002-05-25 10:21:39.000000000 +1000
+++ pmac-2.5/drivers/net/mace.c 2002-08-28 09:14:31.000000000 +1000
@@ -362,6 +362,24 @@
return 0;
}
+static inline void mace_clean_rings(struct mace_data *mp)
+{
+ int i;
+
+ /* free some skb's */
+ for (i = 0; i < N_RX_RING; ++i) {
+ if (mp->rx_bufs[i] != 0) {
+ dev_kfree_skb(mp->rx_bufs[i]);
+ mp->rx_bufs[i] = 0;
+ }
+ }
+ for (i = mp->tx_empty; i != mp->tx_fill; ) {
+ dev_kfree_skb(mp->tx_bufs[i]);
+ if (++i >= N_TX_RING)
+ i = 0;
+ }
+}
+
static int mace_open(struct net_device *dev)
{
struct mace_data *mp = (struct mace_data *) dev->priv;
@@ -432,24 +450,6 @@
return 0;
}
-static inline void mace_clean_rings(struct mace_data *mp)
-{
- int i;
-
- /* free some skb's */
- for (i = 0; i < N_RX_RING; ++i) {
- if (mp->rx_bufs[i] != 0) {
- dev_kfree_skb(mp->rx_bufs[i]);
- mp->rx_bufs[i] = 0;
- }
- }
- for (i = mp->tx_empty; i != mp->tx_fill; ) {
- dev_kfree_skb(mp->tx_bufs[i]);
- if (++i >= N_TX_RING)
- i = 0;
- }
-}
-
static int mace_close(struct net_device *dev)
{
struct mace_data *mp = (struct mace_data *) dev->priv;
reply other threads:[~2002-11-07 4:28 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=15817.60772.305789.777076@argo.ozlabs.ibm.com \
--to=paulus@samba.org \
--cc=benh@kernel.crashing.org \
--cc=jgarzik@pobox.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®