Change scc.c routines to correct (?) calling sequence, needs to be
checked by developer.
diff -ur linux-2.1.21.orig/drivers/net/3c523.c linux/drivers/net/3c523.c
--- linux-2.1.21.orig/drivers/net/3c523.c Tue Dec 31 19:29:59 1996
+++ linux/drivers/net/3c523.c Wed Jan 15 14:04:31 1997
@@ -1143,7 +1143,7 @@
return 0;
}
if(skb->len > XMIT_BUFF_SIZE) {
- printk("%s: Sorry, max. framelength is %d bytes. The length of your frame is %ld bytes.\n",dev->name,XMIT_BUFF_SIZE,skb->len);
+ printk("%s: Sorry, max. framelength is %d bytes. The length of your frame is %d bytes.\n",dev->name,XMIT_BUFF_SIZE,skb->len);
return 0;
}
diff -ur linux-2.1.21.orig/drivers/net/atp.c linux/drivers/net/atp.c
--- linux-2.1.21.orig/drivers/net/atp.c Fri Mar 1 16:50:43 1996
+++ linux/drivers/net/atp.c Wed Jan 15 13:55:39 1997
@@ -762,7 +762,7 @@
{
struct net_local *lp = (struct net_local *)dev->priv;
short ioaddr = dev->base_addr;
- int num_addrs=dev->mc_list;
+ int num_addrs=dev->mc_list != NULL;
if(dev->flags&(IFF_ALLMULTI|IFF_PROMISC))
num_addrs=1;
diff -ur linux-2.1.21.orig/drivers/net/de600.c linux/drivers/net/de600.c
--- linux-2.1.21.orig/drivers/net/de600.c Tue Dec 31 19:30:00 1996
+++ linux/drivers/net/de600.c Wed Jan 15 11:58:24 1997
@@ -88,8 +88,6 @@
#define DE600_DEBUG 0
#define PRINTK(x) /**/
#endif
-unsigned int de600_debug = DE600_DEBUG;
-MODULE_PARM(de600_debug, "i");
#include <linux/module.h>
@@ -110,6 +108,9 @@
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
+
+unsigned int de600_debug = DE600_DEBUG;
+MODULE_PARM(de600_debug, "i");
#ifdef FAKE_SMALL_MAX
static unsigned long de600_rspace(struct sock *sk);
diff -ur linux-2.1.21.orig/drivers/net/dlci.c linux/drivers/net/dlci.c
--- linux-2.1.21.orig/drivers/net/dlci.c Fri Jan 3 00:13:25 1997
+++ linux/drivers/net/dlci.c Wed Jan 15 14:05:25 1997
@@ -587,7 +587,6 @@
int dlci_init(struct device *dev)
{
struct dlci_local *dlp;
- int i;
dev->priv = kmalloc(sizeof(struct dlci_local), GFP_KERNEL);
if (!dev->priv)
diff -ur linux-2.1.21.orig/drivers/net/eql.c linux/drivers/net/eql.c
--- linux-2.1.21.orig/drivers/net/eql.c Fri Jan 3 00:13:25 1997
+++ linux/drivers/net/eql.c Wed Jan 15 14:05:13 1997
@@ -213,7 +213,6 @@
static unsigned version_printed = 0;
/* static unsigned num_masters = 0; */
equalizer_t *eql = 0;
- int i;
if ( version_printed++ == 0 && eql_debug > 0)
printk(version);
diff -ur linux-2.1.21.orig/drivers/net/hdlcdrv.c linux/drivers/net/hdlcdrv.c
--- linux-2.1.21.orig/drivers/net/hdlcdrv.c Wed Jan 15 13:02:50 1997
+++ linux/drivers/net/hdlcdrv.c Wed Jan 15 14:03:49 1997
@@ -743,7 +743,6 @@
static int hdlcdrv_probe(struct device *dev)
{
struct hdlcdrv_channel_params dflt_ch_params = { 20, 2, 10, 40, 0 };
- int i;
struct hdlcdrv_state *s;
if (!dev)
diff -ur linux-2.1.21.orig/drivers/net/lance.c linux/drivers/net/lance.c
--- linux-2.1.21.orig/drivers/net/lance.c Wed Aug 21 16:12:49 1996
+++ linux/drivers/net/lance.c Wed Jan 15 15:10:18 1997
@@ -309,7 +309,7 @@
{
int *port;
- if (high_memory <= 16*1024*1024)
+ if (high_memory <= (void *) MAX_DMA_ADDRESS)
lance_need_isa_bounce_buffers = 0;
#if defined(CONFIG_PCI)
diff -ur linux-2.1.21.orig/drivers/net/pi2.c linux/drivers/net/pi2.c
--- linux-2.1.21.orig/drivers/net/pi2.c Fri Jan 3 00:13:25 1997
+++ linux/drivers/net/pi2.c Wed Jan 15 14:05:00 1997
@@ -1283,7 +1283,6 @@
{
short ioaddr;
struct pi_local *lp;
- int i;
unsigned long flags;
unsigned long mem_ptr;
@@ -1401,7 +1400,7 @@
/* Fill in the fields of the device structure */
- dev_init_buffers(dev):
+ dev_init_buffers(dev);
#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
dev->hard_header = ax25_encapsulate;
diff -ur linux-2.1.21.orig/drivers/net/ppp.c linux/drivers/net/ppp.c
--- linux-2.1.21.orig/drivers/net/ppp.c Wed Jan 15 13:02:51 1997
+++ linux/drivers/net/ppp.c Wed Jan 15 14:03:34 1997
@@ -6,7 +6,7 @@
* Dynamic PPP devices by Jim Freeman <jfree@caldera.com>.
* ppp_tty_receive ``noisy-raise-bug'' fixed by Ove Ewerlid <ewerlid@syscon.uu.se>
*
- * ==FILEVERSION 960528==
+ * ==FILEVERSION 970115==
*
* NOTE TO MAINTAINERS:
* If you modify this file at all, please set the number above to the
@@ -388,7 +388,6 @@
static int
ppp_init_dev (struct device *dev)
{
- int indx;
dev->hard_header_len = PPP_HARD_HDR_LEN;
diff -ur linux-2.1.21.orig/drivers/net/scc.c linux/drivers/net/scc.c
--- linux-2.1.21.orig/drivers/net/scc.c Fri Jan 3 00:13:26 1997
+++ linux/drivers/net/scc.c Wed Jan 15 12:13:58 1997
@@ -202,7 +202,7 @@
static int scc_net_tx(struct sk_buff *skb, struct device *dev);
static int scc_net_ioctl(struct device *dev, struct ifreq *ifr, int cmd);
static int scc_net_set_mac_address(struct device *dev, void *addr);
-static int scc_net_rebuild_header(void *buff, struct device *dev, unsigned long raddr, struct sk_buff *skb);
+static int scc_net_rebuild_header(struct sk_buff *skb);
static int scc_net_header(struct sk_buff *skb, struct device *dev, unsigned short type, void *daddr, void *saddr, unsigned len);
static struct enet_statistics * scc_net_get_stats(struct device *dev);
@@ -347,7 +347,6 @@
skb = dev_alloc_skb(2);
if (skb != NULL)
{
- skb->free = 1;
bp = skb_put(skb, 2);
*bp++ = PARAM_HWEVENT;
*bp++ = event;
@@ -548,7 +547,6 @@
return;
}
- skb->free = 1;
scc->rx_buff = skb;
*(skb_put(skb, 1)) = 0; /* KISS data */