From a10710c0d59c7b21d0094f2ffe5449950f8750aa Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Fri, 28 Jan 2011 05:43:40 +0000
Subject: [PATCH] --- yaml --- r: 232894 b: refs/heads/master c:
 38db9e1db1c91c953b2a539130257ce91533c9f6 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/include/net/genetlink.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 344c82898ce8..54536b64c869 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2d57766e6744f2956975dd2086d82957187b0f6
+refs/heads/master: 38db9e1db1c91c953b2a539130257ce91533c9f6
diff --git a/trunk/include/net/genetlink.h b/trunk/include/net/genetlink.h
index 8a64b811a39a..b4c7c1cbcf40 100644
--- a/trunk/include/net/genetlink.h
+++ b/trunk/include/net/genetlink.h
@@ -195,7 +195,8 @@ static inline int genlmsg_end(struct sk_buff *skb, void *hdr)
  */
 static inline void genlmsg_cancel(struct sk_buff *skb, void *hdr)
 {
-	nlmsg_cancel(skb, hdr - GENL_HDRLEN - NLMSG_HDRLEN);
+	if (hdr)
+		nlmsg_cancel(skb, hdr - GENL_HDRLEN - NLMSG_HDRLEN);
 }
 
 /**