From: David S. Miller Date: Fri, 23 Dec 2011 22:33:03 +0000 (-0500) Subject: netlink: Undo const marker in netlink_is_kernel(). X-Git-Tag: v3.3-rc1~182^2~127 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=035c4c16bea2814890c64c657d177e91cec1f473;p=platform%2Fupstream%2Fkernel-adaptation-pc.git netlink: Undo const marker in netlink_is_kernel(). We can't do this without propagating the const to nlk_sk() too, otherwise: net/netlink/af_netlink.c: In function ‘netlink_is_kernel’: net/netlink/af_netlink.c:103:2: warning: passing argument 1 of ‘nlk_sk’ discards ‘const’ qualifier from pointer target type [enabled by default] net/netlink/af_netlink.c:96:36: note: expected ‘struct sock *’ but argument is of type ‘const struct sock *’ Signed-off-by: David S. Miller --- diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 86a258d..629b061 100644 --- a/net/netlink/af_netlink.c +++ b/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; }