patch-pre2.0.5 linux/net/core/net_alias.c

Next file: linux/net/decnet/README
Previous file: linux/net/core/iovec.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file pre2.0.4/linux/net/core/net_alias.c linux/net/core/net_alias.c
@@ -509,7 +509,7 @@
   {
     if (!(alias = prevdev->next->my_alias))
     {
-      printk(KERN_ERR "ERROR: net_alias_dev_delete(): incorrect non-alias device after maindev\n");
+      printk(KERN_ERR "net_alias_dev_delete(): incorrect non-alias device after maindev\n");
       continue;			/* or should give up? */
     }
     if (alias->slot == slot) break;
@@ -537,7 +537,7 @@
       printk(KERN_WARNING "net_alias_dev_delete(%s): bad hashing recovered\n", alias->name);
     else
     {
-      printk(KERN_ERR "ERROR: net_alias_dev_delete(%s): unhashed alias!\n",alias->name);
+      printk(KERN_ERR "net_alias_dev_delete(%s): unhashed alias!\n",alias->name);
       return NULL;		/* ENODEV */
     }
   
@@ -760,7 +760,7 @@
   
   if (!sa)
   {
-    printk(KERN_ERR "ERROR: net_alias_rehash(): NULL sockaddr passed\n");
+    printk(KERN_ERR "net_alias_rehash(): NULL sockaddr passed\n");
     return -1;
   }
 
@@ -770,7 +770,7 @@
 
   if ( (main_dev = alias->main_dev) == NULL )
   {
-    printk(KERN_ERR "ERROR: net_alias_rehash for %s: NULL maindev\n", alias->name);
+    printk(KERN_ERR "net_alias_rehash for %s: NULL maindev\n", alias->name);
     return -1;
   }
 
@@ -780,7 +780,7 @@
 
   if (!(alias_info=main_dev->alias_info))
   {
-    printk(KERN_ERR "ERROR: net_alias_rehash for %s: NULL alias_info\n", alias->name);
+    printk(KERN_ERR "net_alias_rehash for %s: NULL alias_info\n", alias->name);
     return -1;
   }
   
@@ -791,7 +791,7 @@
   o_nat = alias->nat;
   if (!o_nat)
   {
-    printk(KERN_ERR "ERROR: net_alias_rehash(%s): unbound alias.\n", alias->name);
+    printk(KERN_ERR "net_alias_rehash(%s): unbound alias.\n", alias->name);
     return -1;
   }
 
@@ -806,7 +806,7 @@
     n_nat = nat_getbytype(sa->sa_family);
     if (!n_nat)
     {
-      printk(KERN_ERR "ERROR: net_alias_rehash(%s): unreg family==%d.\n", alias->name, sa->sa_family);
+      printk(KERN_ERR "net_alias_rehash(%s): unreg family==%d.\n", alias->name, sa->sa_family);
       return -1;
     }
   }
@@ -835,7 +835,7 @@
       printk(KERN_WARNING "net_alias_rehash(%s): bad hashing recovered\n", alias->name);
     else
     {
-      printk(KERN_ERR "ERROR: net_alias_rehash(%s): unhashed alias!\n", alias->name);
+      printk(KERN_ERR "net_alias_rehash(%s): unhashed alias!\n", alias->name);
       return -1;
     }
   

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this