From 5e68be8c616594dd1a2ccd28d0594680d204fc50 Mon Sep 17 00:00:00 2001
From: Ying Xue <ying.xue@windriver.com>
Date: Mon, 6 Aug 2012 16:27:10 +0000
Subject: [PATCH] --- yaml --- r: 321568 b: refs/heads/master c:
 99aa3473e672ca610905838997fa018b95cd643f h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/net/packet/af_packet.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index da99ea3dd058..19220a7c77ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9ad2baf91426787bf52dc06f53b0e81553d1c7d
+refs/heads/master: 99aa3473e672ca610905838997fa018b95cd643f
diff --git a/trunk/net/packet/af_packet.c b/trunk/net/packet/af_packet.c
index ceaca7c134a0..f016f6634a79 100644
--- a/trunk/net/packet/af_packet.c
+++ b/trunk/net/packet/af_packet.c
@@ -1079,7 +1079,7 @@ static void *packet_current_rx_frame(struct packet_sock *po,
 	default:
 		WARN(1, "TPACKET version not supported\n");
 		BUG();
-		return 0;
+		return NULL;
 	}
 }