patch-2.1.132 linux/net/rose/rose_dev.c

Next file: linux/net/wanrouter/wanmain.c
Previous file: linux/net/protocols.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.131/linux/net/rose/rose_dev.c linux/net/rose/rose_dev.c
@@ -56,6 +56,7 @@
 {
 	struct net_device_stats *stats = (struct net_device_stats *)dev->priv;
 
+#ifdef CONFIG_INET
 	if (!dev->start) {
 		stats->rx_errors++;
 		return 0;
@@ -73,7 +74,9 @@
 	skb->pkt_type = PACKET_HOST;
 
 	ip_rcv(skb, skb->dev, NULL);
-
+#else
+	kfree_skb(skb);
+#endif
 	return 1;
 }
 
@@ -101,11 +104,8 @@
 	unsigned char *bp = (unsigned char *)skb->data;
 	struct sk_buff *skbn;
 
+#ifdef CONFIG_INET
 	if (arp_find(bp + 7, skb)) {
-#if 0
-		/* BUGGGG! If arp_find returned 1, skb does not exist. --ANK*/
-		kfree_skb(skb);
-#endif
 		return 1;
 	}
 
@@ -126,7 +126,7 @@
 
 	stats->tx_packets++;
 	stats->tx_bytes += skbn->len;
-
+#endif
 	return 1;
 }
 

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