patch-2.4.21 linux-2.4.21/drivers/net/sun3_82586.c
Next file: linux-2.4.21/drivers/net/sun3lance.c
Previous file: linux-2.4.21/drivers/net/starfire.c
Back to the patch index
Back to the overall index
- Lines: 49
- Date:
2003-06-13 07:51:35.000000000 -0700
- Orig file:
linux-2.4.20/drivers/net/sun3_82586.c
- Orig date:
2002-08-02 17:39:44.000000000 -0700
diff -urN linux-2.4.20/drivers/net/sun3_82586.c linux-2.4.21/drivers/net/sun3_82586.c
@@ -279,7 +279,7 @@
int __init sun3_82586_probe(struct net_device *dev)
{
- unsigned long ioaddr, iopte;
+ unsigned long ioaddr;
static int found = 0;
/* check that this machine has an onboard 82586 */
@@ -296,22 +296,8 @@
if(found)
return -ENODEV;
- for(ioaddr = 0xfe00000; ioaddr < (0xfe00000 +
- SUN3_PMEG_SIZE); ioaddr += SUN3_PTE_SIZE) {
-
- iopte = sun3_get_pte(ioaddr);
- if(!(iopte & SUN3_PAGE_TYPE_IO)) /* this an io page? */
- continue;
-
- if(((iopte & SUN3_PAGE_PGNUM_MASK) << PAGE_SHIFT) ==
- IE_OBIO) {
- found = 1;
- break;
- }
- }
-
- if(!found)
- return 0;
+ ioaddr = (unsigned long)ioremap(IE_OBIO, PAGE_SIZE);
+ found = 1;
SET_MODULE_OWNER(dev);
@@ -1024,8 +1010,13 @@
else
#endif
{
+ len = skb->len;
+ if(len < ETH_ZLEN)
+ {
+ memset((char *)p->xmit_cbuffs[p->xmit_count], 0, ETH_ZLEN);
+ len = ETH_ZLEN;
+ }
memcpy((char *)p->xmit_cbuffs[p->xmit_count],(char *)(skb->data),skb->len);
- len = (ETH_ZLEN < skb->len) ? skb->len : ETH_ZLEN;
#if (NUM_XMIT_BUFFS == 1)
# ifdef NO_NOPCOMMANDS
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)