diff options
author | Pavel Emelyanov <xemul@parallels.com> | 2012-01-10 17:36:35 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-01-11 15:56:06 -0500 |
commit | c8991362a0d3cf317dfbfb6cb946607870654e6d (patch) | |
tree | 21db1072591e2549fedd6d54586efe3ef7f45cb4 /include/linux/inet_diag.h | |
parent | f515e6b77045b4b1f54617d9fbf4a22b95a58757 (diff) |
inet_diag: Rename inet_diag_req into inet_diag_req_v2
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/inet_diag.h')
-rw-r--r-- | include/linux/inet_diag.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/inet_diag.h b/include/linux/inet_diag.h index 34e8d52c1925..a5b7e910eea9 100644 --- a/include/linux/inet_diag.h +++ b/include/linux/inet_diag.h | |||
@@ -34,7 +34,7 @@ struct inet_diag_req_compat { | |||
34 | __u32 idiag_dbs; /* Tables to dump (NI) */ | 34 | __u32 idiag_dbs; /* Tables to dump (NI) */ |
35 | }; | 35 | }; |
36 | 36 | ||
37 | struct inet_diag_req { | 37 | struct inet_diag_req_v2 { |
38 | __u8 sdiag_family; | 38 | __u8 sdiag_family; |
39 | __u8 sdiag_protocol; | 39 | __u8 sdiag_protocol; |
40 | __u8 idiag_ext; | 40 | __u8 idiag_ext; |
@@ -143,12 +143,12 @@ struct netlink_callback; | |||
143 | struct inet_diag_handler { | 143 | struct inet_diag_handler { |
144 | void (*dump)(struct sk_buff *skb, | 144 | void (*dump)(struct sk_buff *skb, |
145 | struct netlink_callback *cb, | 145 | struct netlink_callback *cb, |
146 | struct inet_diag_req *r, | 146 | struct inet_diag_req_v2 *r, |
147 | struct nlattr *bc); | 147 | struct nlattr *bc); |
148 | 148 | ||
149 | int (*dump_one)(struct sk_buff *in_skb, | 149 | int (*dump_one)(struct sk_buff *in_skb, |
150 | const struct nlmsghdr *nlh, | 150 | const struct nlmsghdr *nlh, |
151 | struct inet_diag_req *req); | 151 | struct inet_diag_req_v2 *req); |
152 | 152 | ||
153 | void (*idiag_get_info)(struct sock *sk, | 153 | void (*idiag_get_info)(struct sock *sk, |
154 | struct inet_diag_msg *r, | 154 | struct inet_diag_msg *r, |
@@ -158,15 +158,15 @@ struct inet_diag_handler { | |||
158 | 158 | ||
159 | struct inet_connection_sock; | 159 | struct inet_connection_sock; |
160 | int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk, | 160 | int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk, |
161 | struct sk_buff *skb, struct inet_diag_req *req, | 161 | struct sk_buff *skb, struct inet_diag_req_v2 *req, |
162 | u32 pid, u32 seq, u16 nlmsg_flags, | 162 | u32 pid, u32 seq, u16 nlmsg_flags, |
163 | const struct nlmsghdr *unlh); | 163 | const struct nlmsghdr *unlh); |
164 | void inet_diag_dump_icsk(struct inet_hashinfo *h, struct sk_buff *skb, | 164 | void inet_diag_dump_icsk(struct inet_hashinfo *h, struct sk_buff *skb, |
165 | struct netlink_callback *cb, struct inet_diag_req *r, | 165 | struct netlink_callback *cb, struct inet_diag_req_v2 *r, |
166 | struct nlattr *bc); | 166 | struct nlattr *bc); |
167 | int inet_diag_dump_one_icsk(struct inet_hashinfo *hashinfo, | 167 | int inet_diag_dump_one_icsk(struct inet_hashinfo *hashinfo, |
168 | struct sk_buff *in_skb, const struct nlmsghdr *nlh, | 168 | struct sk_buff *in_skb, const struct nlmsghdr *nlh, |
169 | struct inet_diag_req *req); | 169 | struct inet_diag_req_v2 *req); |
170 | 170 | ||
171 | int inet_diag_bc_sk(const struct nlattr *_bc, struct sock *sk); | 171 | int inet_diag_bc_sk(const struct nlattr *_bc, struct sock *sk); |
172 | 172 | ||