patch-2.1.67 linux/drivers/net/hdlcdrv.c

Next file: linux/drivers/net/hp100.c
Previous file: linux/drivers/net/ewrk3.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.66/linux/drivers/net/hdlcdrv.c linux/drivers/net/hdlcdrv.c
@@ -63,7 +63,6 @@
 #include <linux/ip.h>
 #include <linux/udp.h>
 #include <linux/tcp.h>
-#include <linux/net_alias.h>
 
 /* --------------------------------------------------------------------- */
 
@@ -569,15 +568,6 @@
 	if (hdlcdrv_paranoia_check(dev, "hdlcdrv_send_packet"))
 		return 0;
 	sm = (struct hdlcdrv_state *)dev->priv;
-	/*
-	 * If some higher layer thinks we've missed an tx-done interrupt
-         * we are passed NULL. Caution: dev_tint() handles the cli()/sti()
-	 * itself. 
-	 */
-	if (skb == NULL) {
-		dev_tint(dev);
-		return 0;
-	}
 	skb_queue_tail(&sm->send_queue, skb);
 	dev->trans_start = jiffies;	
 	return 0;
@@ -908,11 +898,6 @@
 
 	/* New style flags */
 	dev->flags = 0;
-	dev->family = AF_INET;
-	dev->pa_addr = 0;
-	dev->pa_brdaddr = 0;
-	dev->pa_mask = 0;
-	dev->pa_alen = sizeof(unsigned long);
 
 	return 0;
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov