| Message ID | 51779347.2000808@asianux.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
aFrom: Chen Gang <gang.chen@asianux.com> Date: Wed, 24 Apr 2013 16:09:43 +0800 > > When disable CONFIG_NETLINK_MMAP, need a dummy function for > sk_diag_put_rings_cfg, or will cause compiling issue. > > Signed-off-by: Chen Gang <gang.chen@asianux.com> This was fixed more than 12 hours ago. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 2013年04月24日 16:11, David Miller wrote: > aFrom: Chen Gang <gang.chen@asianux.com> > Date: Wed, 24 Apr 2013 16:09:43 +0800 > >> > >> > When disable CONFIG_NETLINK_MMAP, need a dummy function for >> > sk_diag_put_rings_cfg, or will cause compiling issue. >> > >> > Signed-off-by: Chen Gang <gang.chen@asianux.com> > This was fixed more than 12 hours ago. > > Ok, thanks.
diff --git a/net/netlink/diag.c b/net/netlink/diag.c index 4e4aa47..d0ab090 100644 --- a/net/netlink/diag.c +++ b/net/netlink/diag.c @@ -7,6 +7,8 @@ #include "af_netlink.h" +#ifdef CONFIG_NETLINK_MMAP + static int sk_diag_put_ring(struct netlink_ring *ring, int nl_type, struct sk_buff *nlskb) { @@ -35,6 +37,15 @@ static int sk_diag_put_rings_cfg(struct sock *sk, struct sk_buff *nlskb) return ret; } +#else /* !CONFIG_NETLINK_MMAP */ + +static int sk_diag_put_rings_cfg(struct sock *sk, struct sk_buff *nlskb) +{ + return 0; +} + +#endif /* CONFIG_NETLINK_MMAP */ + static int sk_diag_dump_groups(struct sock *sk, struct sk_buff *nlskb) { struct netlink_sock *nlk = nlk_sk(sk);
When disable CONFIG_NETLINK_MMAP, need a dummy function for sk_diag_put_rings_cfg, or will cause compiling issue. Signed-off-by: Chen Gang <gang.chen@asianux.com> --- net/netlink/diag.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-)