patch-2.4.10 linux/drivers/net/dgrs.c
Next file: linux/drivers/net/dl2k.c
Previous file: linux/drivers/net/declance.c
Back to the patch index
Back to the overall index
- Lines: 17
- Date:
Mon Sep 10 08:06:32 2001
- Orig file:
v2.4.9/linux/drivers/net/dgrs.c
- Orig date:
Mon Aug 27 12:41:42 2001
diff -u --recursive --new-file v2.4.9/linux/drivers/net/dgrs.c linux/drivers/net/dgrs.c
@@ -733,7 +733,7 @@
goto no_resources;
}
- amt = min(unsigned int, len, rbdp->size - count);
+ amt = min_t(unsigned int, len, rbdp->size - count);
memcpy( (char *) S2H(rbdp->buf) + count, skb->data + i, amt);
i += amt;
count += amt;
@@ -1292,6 +1292,7 @@
if (!devN)
goto fail;
memcpy(devN, dev, dev_size);
+ memset(devN->name, 0, sizeof(devN->name));
devN->priv = ((void *)devN) + sizeof(struct net_device);
privN = (DGRS_PRIV *)devN->priv;
/* ... and zero out VM areas */
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)