patch-2.1.31 linux/net/core/dev.c

• Lines: 84
• Date: Mon Mar 31 12:52:32 1997
• Orig file: v2.1.30/linux/net/core/dev.c
• Orig date: Sun Feb 2 05:18:49 1997

diff -u --recursive --new-file v2.1.30/linux/net/core/dev.c linux/net/core/dev.c
@@ -250,7 +250,46 @@
 	}
 	return(NULL);
 }
-	
+
+/*
+ *	Passed a format string - eg "lt%d" it will try and find a suitable
+ *	id. Not efficient for many devices, not called a lot..
+ */
+
+int dev_alloc_name(struct device *dev, const char *name)
+{
+	int i;
+	/*
+	 *	If you need over 100 please also fix the algorithm...
+	 */
+	for(i=0;i<100;i++)
+	{
+		sprintf(dev->name,name,i);
+		if(dev_get(dev->name)==NULL)
+			return i;
+	}
+	return -ENFILE;	/* Over 100 of the things .. bail out! */
+}
+ 
+struct device *dev_alloc(const char *name, int *err)
+{
+	struct device *dev=kmalloc(sizeof(struct device)+16, GFP_KERNEL);
+	if(dev==NULL)
+	{
+		*err=-ENOBUFS;
+		return NULL;
+	}
+	dev->name=(char *)(dev+1);	/* Name string space */
+	*err=dev_alloc_name(dev,name);
+	if(*err<0)
+	{
+		kfree(dev);
+		return NULL;
+	}
+	return dev;
+}
+
+
 /*
  *	Find and possibly load an interface.
  */
@@ -560,7 +599,7 @@
 			}
 		} 
 		else
-			printk("%s: !skb->arp & !rebuild_header!\n", dev->name);
+			printk(KERN_DEBUG "%s: !skb->arp & !rebuild_header!\n", dev->name);
 	}
 
 	/*
@@ -592,7 +631,7 @@
 	skb_pull(newskb, newskb->nh.raw - newskb->data);
 	newskb->ip_summed = CHECKSUM_UNNECESSARY;
 	if (newskb->dst==NULL)
-		printk("BUG: packet without dst looped back 1\n");
+		printk(KERN_DEBUG "BUG: packet without dst looped back 1\n");
 	netif_rx(newskb);
 }
 
@@ -880,7 +919,7 @@
 	 */
 
 	if (net_alias_is(dev)) {
-		printk("net alias %s transmits\n", dev->name);
+		printk(KERN_DEBUG "net alias %s transmits\n", dev->name);
 		return;
 	}
 
@@ -1010,7 +1049,7 @@
 	int size;
 	
 	if (stats)
-		size = sprintf(buffer, "%6s:%8ld %7ld %4ld %4ld %4ld %4ld %8ld %8ld %4ld %4ld %4ld %5ld %4ld\n",
+		size = sprintf(buffer, "%6s:%8lu %7lu %4lu %4lu %4lu %4lu %8lu %8lu %4lu %4lu %4lu %5lu %4lu\n",
 		   dev->name,
 		   stats->rx_bytes,
 		   stats->rx_packets, stats->rx_errors,