From 03d317743b5e889072d4a02e8e3957363f5d1083 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Sun, 21 Apr 2013 00:09:32 +0000
Subject: [PATCH] --- yaml --- r: 369352 b: refs/heads/master c:
 8da63a655d5b8ec16512ae6bfeee40c50f11404f h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/8021q/vlan.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 826edd5ad7cd..b36669e7cec6 100644
--- 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
index abc9cb631c47..ba5983f34c42 100644
--- 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;
 	}
 }