diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-09-20 13:12:59 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-09-20 13:12:59 -0700 |
| commit | 321249bb2f9c61fd19adead0de1e058b94108d18 (patch) | |
| tree | 58beee90c04911c4bcb08da2b2a76fe7c486f485 /include/linux/inet_diag.h | |
| parent | a517d900c6b4996dd6a6ba2f600dabe1c4da717a (diff) | |
| parent | b7c491d2c40fde253ec06a63b3f93ea60c0467a9 (diff) | |
Merge remote-tracking branch 'common/android-4.4' into android-4.4.y-merge
Change-Id: I049d2e9d238a92d56100e8e317be6688497eb501
Diffstat (limited to 'include/linux/inet_diag.h')
| -rw-r--r-- | include/linux/inet_diag.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/inet_diag.h b/include/linux/inet_diag.h index 7c27fa1030e8..795852dc3434 100644 --- a/include/linux/inet_diag.h +++ b/include/linux/inet_diag.h @@ -37,7 +37,7 @@ 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 pid, u32 seq, u16 nlmsg_flags, - const struct nlmsghdr *unlh); + const struct nlmsghdr *unlh, bool net_admin); void inet_diag_dump_icsk(struct inet_hashinfo *h, struct sk_buff *skb, struct netlink_callback *cb, const struct inet_diag_req_v2 *r, |