Re: 2.1.21-patch_drivers_net-1

Alan Cox (alan@lxorguk.ukuu.org.uk)
Wed, 15 Jan 1997 20:42:48 +0000 (GMT)


> 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;

Fixed (test removed as its redundant nowdays)

> 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;

Wrong fix: Changed to use dev->mc_count. Added. Worked before for all
the wrong reasons (ptr==NULL NULL==0)

> @@ -587,7 +587,6 @@
> int dlci_init(struct device *dev)
> {
> struct dlci_local *dlp;
> - int i;

Done

> 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;

Done

> @@ -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;

Done

> +++ 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;

Rejected. The original code is correct. The lance 16bit has a 24bit internal
DMA counter limit.

> +++ linux/drivers/net/pi2.c Wed Jan 15 14:05:00 1997
> @@ -1283,7 +1283,6 @@
> {
> short ioaddr;
> struct pi_local *lp;
> - int i;

Done

> @@ -388,7 +388,6 @@
> static int
> ppp_init_dev (struct device *dev)
> {
> - int indx;
>
> dev->hard_header_len = PPP_HARD_HDR_LEN;

Done

> --- 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 @@

Done