Re: [PATCH net-next v3 1/2] inet_diag: allow protocols to provide additional data

[Stephen Hemminger]

On Tue, 29 Aug 2017 15:29:53 -0700
Ivan Delalande <col...@arista.com> wrote:

> @@ -452,13 +466,14 @@ int inet_diag_dump_one_icsk(struct inet_hashinfo 
> *hashinfo,
>       struct net *net = sock_net(in_skb->sk);
>       struct sk_buff *rep;
>       struct sock *sk;
> +     bool net_admin = netlink_net_capable(in_skb, CAP_NET_ADMIN);

Please keep declarations in Christmas tree order if possible.

int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk,
                      struct sk_buff *skb, const struct inet_diag_req_v2 *req,
                      struct user_namespace *user_ns,
                      u32 portid, u32 seq, u16 nlmsg_flags,
                      const struct nlmsghdr *unlh,
                      bool net_admin)
{
        bool net_admin = netlink_net_capable(in_skb, CAP_NET_ADMIN);
        const struct tcp_congestion_ops *ca_ops;
        const struct inet_diag_handler *handler;
        int ext = req->idiag_ext;
        struct inet_diag_msg *r;
        struct nlmsghdr  *nlh;
        struct nlattr *attr;
        void *info = NULL;