patch-2.4.21 linux-2.4.21/drivers/net/hp100.c
Next file: linux-2.4.21/drivers/net/irda/Config.in
Previous file: linux-2.4.21/drivers/net/hamachi.c
Back to the patch index
Back to the overall index
- Lines: 34
- Date:
2003-06-13 07:51:34.000000000 -0700
- Orig file:
linux-2.4.20/drivers/net/hp100.c
- Orig date:
2002-11-28 15:53:13.000000000 -0800
diff -urN linux-2.4.20/drivers/net/hp100.c linux-2.4.21/drivers/net/hp100.c
@@ -1542,6 +1542,13 @@
if (skb->len <= 0)
return 0;
+
+ if (skb->len < ETH_ZLEN && lp->chip == HP100_CHIPID_SHASTA)
+ {
+ skb = skb_padto(skb, ETH_ZLEN);
+ if(skb == NULL)
+ return 0;
+ }
/* Get Tx ring tail pointer */
if (lp->txrtail->next == lp->txrhead) {
@@ -2099,6 +2106,7 @@
struct hp100_private *lp = (struct hp100_private *) dev->priv;
#ifdef HP100_DEBUG_B
+ int ioaddr = dev->base_addr;
hp100_outw(0x4216, TRACE);
printk("hp100: %s: misc_interrupt\n", dev->name);
#endif
@@ -2538,6 +2546,11 @@
return HP100_LAN_10;
if (val_10 & HP100_AUI_ST) { /* have we BNC or AUI onboard? */
+ /*
+ * This can be overriden by dos utility, so if this has no effect,
+ * perhaps you need to download that utility from HP and set card
+ * back to "auto detect".
+ */
val_10 |= HP100_AUI_SEL | HP100_LOW_TH;
hp100_page(MAC_CTRL);
hp100_outb(val_10, 10_LAN_CFG_1);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)