diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-02-14 13:28:29 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-02-14 13:28:31 +0100 |
commit | b366801c95bdbeda811ac9668a3943051a18c188 (patch) | |
tree | 79f08da2ad33a3159e67df344a4c411c88da7db6 /include/net/genetlink.h | |
parent | eff9073790e1286aa12bf1c65814d3e0132b12e1 (diff) | |
parent | 100b33c8bd8a3235fd0b7948338d6cbb3db3c63d (diff) | |
download | lwn-b366801c95bdbeda811ac9668a3943051a18c188.tar.gz lwn-b366801c95bdbeda811ac9668a3943051a18c188.zip |
Merge commit 'v2.6.38-rc4' into x86/numa
Merge reason: Merge latest fixes before applying new patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/net/genetlink.h')
-rw-r--r-- | include/net/genetlink.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/genetlink.h b/include/net/genetlink.h index 8a64b811a39a..b4c7c1cbcf40 100644 --- a/include/net/genetlink.h +++ b/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); } /** |