From cb9f3a1edc62eae6cf833108998aaf1e408c3dbe Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Fri, 23 Dec 2011 17:33:03 -0500
Subject: [PATCH] --- yaml --- r: 279057 b: refs/heads/master c:
 035c4c16bea2814890c64c657d177e91cec1f473 h: refs/heads/master i:   279055:
 9b22168fc03c27267e9f9ff404ce0ca9a8da203f v: v3

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

diff --git a/[refs] b/[refs]
index ebbac2408d4f..5434745cd15a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: abb434cb0539fb355c1c921f8fd761efbbac3462
+refs/heads/master: 035c4c16bea2814890c64c657d177e91cec1f473
diff --git a/trunk/net/netlink/af_netlink.c b/trunk/net/netlink/af_netlink.c
index 86a258d9af84..629b06182f3f 100644
--- a/trunk/net/netlink/af_netlink.c
+++ b/trunk/net/netlink/af_netlink.c
@@ -98,7 +98,7 @@ static inline struct netlink_sock *nlk_sk(struct sock *sk)
 	return container_of(sk, struct netlink_sock, sk);
 }
 
-static inline int netlink_is_kernel(const struct sock *sk)
+static inline int netlink_is_kernel(struct sock *sk)
 {
 	return nlk_sk(sk)->flags & NETLINK_KERNEL_SOCKET;
 }