Skip to contentSkip to conversation

e1000: Print mac address on one line

PATCH New Tormod Volden 2 participants 3 messages Aug 11, 2019 – Aug 12, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 e1000: Print mac address on one line

From: Tormod Volden <[email protected]>

---

KERN_CONT is not multithread-safe but in most cases this will show up nicer than it did.

 kernel/drivers/net/drivers/e1000/e1000_main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/drivers/net/drivers/e1000/e1000_main.c +2 -1
index 491b828..329c69c 100644
@@ -918,8 +918,9 @@ static int e1000_probe(struct pci_dev *pdev,
 		 "32-bit"));
 	}
 
+	printk(KERN_INFO "e1000: hw ");
 	for (i = 0; i < 6; i++)
-		printk("%2.2x%c", netdev->dev_addr[i], i == 5 ? '\n' : ':');
+		printk(KERN_CONT "%2.2x%c", netdev->dev_addr[i], i == 5 ? '\n' : ':');
 
 	/* reset the hardware with the new settings */
 	e1000_reset(adapter);
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 loopback: Prepend module name to log messages

From: Tormod Volden <[email protected]>

---
 kernel/drivers/net/drivers/loopback.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
kernel/drivers/net/drivers/loopback.c +5 -2
index ef5323a..ebfcf5c 100644
@@ -18,6 +18,9 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/printk.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -93,7 +96,7 @@ static int __init loopback_init(void)
     int err;
     struct rtnet_device *rtdev;
 
-    printk("initializing loopback...\n");
+    pr_info("initializing loopback interface...\n");
 
     if ((rtdev = rt_alloc_etherdev(0, 1)) == NULL)
 	return -ENODEV;
@@ -129,7 +132,7 @@ static void __exit loopback_cleanup(void)
 {
     struct rtnet_device *rtdev = rt_loopback_dev;
 
-    printk("removing loopback...\n");
+    pr_info("removing loopback interface...\n");
 
     rt_unregister_rtnetdev(rtdev);
     rt_rtdev_disconnect(rtdev);
Signature · 1 line
2.7.4
Applied
#2 lore raw

Re: [PATCH] loopback: Prepend module name to log messages

Quoted 32 lines · Tormod Volden via Xenomai

From: Tormod Volden <[email protected]>

---
  kernel/drivers/net/drivers/loopback.c | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
kernel/drivers/net/drivers/loopback.c +4 -1
index ef5323a..ebfcf5c 100644
@@ -18,6 +18,9 @@
   * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
   */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/printk.h>
  #include <linux/module.h>
  #include <linux/kernel.h>
  #include <linux/init.h>
@@ -93,7 +96,7 @@ static int __init loopback_init(void)
      int err;
      struct rtnet_device *rtdev;
 
-    printk("initializing loopback...\n");
+    pr_info("initializing loopback interface...\n");
 
      if ((rtdev = rt_alloc_etherdev(0, 1)) == NULL)
  	return -ENODEV;

kernel/drivers/net/drivers/loopback.c static void __exit loopback_cleanup(void) · line 138

Quoted 8 lines
kernel/drivers/net/drivers/loopback.c +1 -1
@@ -129,7 +132,7 @@ static void __exit loopback_cleanup(void)
  {
      struct rtnet_device *rtdev = rt_loopback_dev;
 
-    printk("removing loopback...\n");
+    pr_info("removing loopback interface...\n");
 
      rt_unregister_rtnetdev(rtdev);
      rt_rtdev_disconnect(rtdev);

Thanks, applied both to next.

Jan

Signature · 2 lines
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux