From 5492e06918416d7223c05339e0e8ee8f44fb86cf Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Thu, 4 Oct 2012 17:13:35 -0700
Subject: [PATCH] --- yaml --- r: 330097 b: refs/heads/master c:
 058806007450489bb8f457b275e5cb5c946320c1 h: refs/heads/master i:   330095:
 5283469022e3c58032fae93384c2e1ed61885868 v: v3

---
 [refs]                      |  2 +-
 trunk/scripts/checkpatch.pl | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 40c62427fda4..bc9c70e67b58 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f26b8376faad26372a579606ecbd77b20e99dd8
+refs/heads/master: 058806007450489bb8f457b275e5cb5c946320c1
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index 844af8b4c078..8e5ac71f42ee 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -1882,6 +1882,20 @@ sub process {
 			    "No space is necessary after a cast\n" . $hereprev);
 		}
 
+		if ($realfile =~ m@^(drivers/net/|net/)@ &&
+		    $rawline =~ /^\+[ \t]*\/\*[ \t]*$/ &&
+		    $prevrawline =~ /^\+[ \t]*$/) {
+			WARN("NETWORKING_BLOCK_COMMENT_STYLE",
+			     "networking block comments don't use an empty /* line, use /* Comment...\n" . $hereprev);
+		}
+
+		if ($realfile =~ m@^(drivers/net/|net/)@ &&
+		    $rawline !~ m@^\+[ \t]*(\/\*|\*\/)@ &&
+		    $rawline =~ m@^\+[ \t]*.+\*\/[ \t]*$@) {
+			WARN("NETWORKING_BLOCK_COMMENT_STYLE",
+			     "networking block comments put the trailing */ on a separate line\n" . $herecurr);
+		}
+
 # check for spaces at the beginning of a line.
 # Exceptions:
 #  1) within comments