Skip to contentSkip to conversation

2.6.x net driver updates

PATCH New Jeff Garzik 1 participant 1 message Sep 28, 2003

Subsystems (3)
Networking Network drivers Networking drivers (wireless)
lore
Share & tools
lore

Jeff Garzik

author
#0 lore raw

PATCH 1/1 2.6.x net driver updates

Linus, please do a

bk pull bk://kernel.bkbits.net/jgarzik/net-drivers-2.5

This will update the following files:

 drivers/net/Space.c               |    4 
 drivers/net/ne3210.c              |  293 ++++++++++++++++----------------------
 drivers/net/wireless/arlan-main.c |    2 
 include/linux/hdlcdrv.h           |   10 -
 4 files changed, 137 insertions(+), 172 deletions(-)

through these ChangeSets:

<[email protected]> (03/09/28 1.1378)
[PATCH] ne3210 update

The enclosed patch ports the ne3210 driver over the EISA probing API.

It also fixes some ioremap/isa_memcopy_fromio problems (depending on where the card memory was mapped) by using ioremap unconditionally and letting memcopy_fromio do the right thing.

Finally, it removes the card from Space.c (warning, potential interface renumbering !).

The module options are currently disabled, until Rusty's module_param_array() patch is included. I will re-introduce them ASAP.

Quite heavily tested on x86.

<[email protected]> (03/09/28 1.1377)
[PATCH] Fix warnings in hamradio/baycom build

Sorry, overlooked the corresponding .h file in that patch, here it is.

<[email protected]> (03/09/28 1.1376)
[PATCH] Fix debug statement after return in drivers/net/wireless/arlan-main.c

This patch applies to 2.5.68 and is listed on kbugs.org. The debug statement is never executed because it is after a return.

drivers/net/Space.c +0 -4
diff -Nru a/drivers/net/Space.c b/drivers/net/Space.c
@@ -67,7 +67,6 @@
 extern int ac3200_probe(struct net_device *);
 extern int es_probe(struct net_device *);
 extern int lne390_probe(struct net_device *);
-extern int ne3210_probe(struct net_device *);
 extern int e2100_probe(struct net_device *);
 extern int ni5010_probe(struct net_device *);
 extern int ni52_probe(struct net_device *);

@@ -154,9 +153,6 @@
 #endif
 #ifdef CONFIG_LNE390
 	{lne390_probe, 0},
-#endif
-#ifdef CONFIG_NE3210
-	{ne3210_probe, 0},
 #endif
 	{NULL, 0},
 };
drivers/net/ne3210.c +131 -162

422 lines not on this page · raw message

drivers/net/wireless/arlan-main.c +1 -1
diff -Nru a/drivers/net/wireless/arlan-main.c b/drivers/net/wireless/arlan-main.c
@@ -721,9 +721,9 @@
 	else
 	{
 		netif_stop_queue (dev);
-		return -1;
 		IFDEBUG(ARLAN_DEBUG_TX_CHAIN)
 			printk(KERN_ERR "TX TAIL & HEAD full, return, tailStart %d headEnd %d\n", tailStarts, headEnds);
+		return -1;
 	}
 	priv->out_bytes += length;
 	priv->out_bytes10 += length;
include/linux/hdlcdrv.h +5 -5
diff -Nru a/include/linux/hdlcdrv.h b/include/linux/hdlcdrv.h
@@ -359,11 +359,11 @@
 void hdlcdrv_receiver(struct net_device *, struct hdlcdrv_state *);
 void hdlcdrv_transmitter(struct net_device *, struct hdlcdrv_state *);
 void hdlcdrv_arbitrate(struct net_device *, struct hdlcdrv_state *);
-int hdlcdrv_register_hdlcdrv(struct net_device *dev, const struct hdlcdrv_ops *ops,
-			     unsigned int privsize, char *ifname,
-			     unsigned int baseaddr, unsigned int irq, 
-			     unsigned int dma);
-int hdlcdrv_unregister_hdlcdrv(struct net_device *dev);
+struct net_device *hdlcdrv_register(const struct hdlcdrv_ops *ops,
+				    unsigned int privsize, const char *ifname,
+				    unsigned int baseaddr, unsigned int irq, 
+				    unsigned int dma);
+void hdlcdrv_unregister(struct net_device *dev);
 
 /* -------------------------------------------------------------------- */