---

yaml --- r: 369352 b: refs/heads/master c: 8da63a6 h: refs/heads/master v: v3
git-mirror · Apr 21, 2013 · 03d3177 · 03d3177
1 parent 7a7a892
commit 03d3177
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9fae27b33785cb6350f21449073d9f7d1a2bbfd6
+refs/heads/master: 8da63a655d5b8ec16512ae6bfeee40c50f11404f
diff --git a/trunk/net/8021q/vlan.h b/trunk/net/8021q/vlan.h
@@ -121,6 +121,7 @@ static inline unsigned int vlan_proto_idx(__be16 proto)
 		return VLAN_PROTO_8021AD;
 	default:
 		BUG();
+		return 0;
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -121,6 +121,7 @@ static inline unsigned int vlan_proto_idx(__be16 proto) @@
     		return VLAN_PROTO_8021AD;
     	default:
     		BUG();
+    		return 0;
     	}
     }
@@ Expand Down @@