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 /net/ipv4/udp_diag.c | |
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 'net/ipv4/udp_diag.c')
-rw-r--r-- | net/ipv4/udp_diag.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/ipv4/udp_diag.c b/net/ipv4/udp_diag.c index 69f8a7ca63dd..e5e18cb8a586 100644 --- a/net/ipv4/udp_diag.c +++ b/net/ipv4/udp_diag.c | |||
@@ -19,7 +19,7 @@ | |||
19 | #include <linux/sock_diag.h> | 19 | #include <linux/sock_diag.h> |
20 | 20 | ||
21 | static int sk_diag_dump(struct sock *sk, struct sk_buff *skb, | 21 | static int sk_diag_dump(struct sock *sk, struct sk_buff *skb, |
22 | struct netlink_callback *cb, struct inet_diag_req *req, | 22 | struct netlink_callback *cb, struct inet_diag_req_v2 *req, |
23 | struct nlattr *bc) | 23 | struct nlattr *bc) |
24 | { | 24 | { |
25 | if (!inet_diag_bc_sk(bc, sk)) | 25 | if (!inet_diag_bc_sk(bc, sk)) |
@@ -30,7 +30,7 @@ static int sk_diag_dump(struct sock *sk, struct sk_buff *skb, | |||
30 | } | 30 | } |
31 | 31 | ||
32 | static int udp_dump_one(struct udp_table *tbl, struct sk_buff *in_skb, | 32 | static int udp_dump_one(struct udp_table *tbl, struct sk_buff *in_skb, |
33 | const struct nlmsghdr *nlh, struct inet_diag_req *req) | 33 | const struct nlmsghdr *nlh, struct inet_diag_req_v2 *req) |
34 | { | 34 | { |
35 | int err = -EINVAL; | 35 | int err = -EINVAL; |
36 | struct sock *sk; | 36 | struct sock *sk; |
@@ -88,7 +88,7 @@ out_nosk: | |||
88 | } | 88 | } |
89 | 89 | ||
90 | static void udp_dump(struct udp_table *table, struct sk_buff *skb, struct netlink_callback *cb, | 90 | static void udp_dump(struct udp_table *table, struct sk_buff *skb, struct netlink_callback *cb, |
91 | struct inet_diag_req *r, struct nlattr *bc) | 91 | struct inet_diag_req_v2 *r, struct nlattr *bc) |
92 | { | 92 | { |
93 | int num, s_num, slot, s_slot; | 93 | int num, s_num, slot, s_slot; |
94 | 94 | ||
@@ -136,13 +136,13 @@ done: | |||
136 | } | 136 | } |
137 | 137 | ||
138 | static void udp_diag_dump(struct sk_buff *skb, struct netlink_callback *cb, | 138 | static void udp_diag_dump(struct sk_buff *skb, struct netlink_callback *cb, |
139 | struct inet_diag_req *r, struct nlattr *bc) | 139 | struct inet_diag_req_v2 *r, struct nlattr *bc) |
140 | { | 140 | { |
141 | udp_dump(&udp_table, skb, cb, r, bc); | 141 | udp_dump(&udp_table, skb, cb, r, bc); |
142 | } | 142 | } |
143 | 143 | ||
144 | static int udp_diag_dump_one(struct sk_buff *in_skb, const struct nlmsghdr *nlh, | 144 | static int udp_diag_dump_one(struct sk_buff *in_skb, const struct nlmsghdr *nlh, |
145 | struct inet_diag_req *req) | 145 | struct inet_diag_req_v2 *req) |
146 | { | 146 | { |
147 | return udp_dump_one(&udp_table, in_skb, nlh, req); | 147 | return udp_dump_one(&udp_table, in_skb, nlh, req); |
148 | } | 148 | } |
@@ -154,13 +154,13 @@ static const struct inet_diag_handler udp_diag_handler = { | |||
154 | }; | 154 | }; |
155 | 155 | ||
156 | static void udplite_diag_dump(struct sk_buff *skb, struct netlink_callback *cb, | 156 | static void udplite_diag_dump(struct sk_buff *skb, struct netlink_callback *cb, |
157 | struct inet_diag_req *r, struct nlattr *bc) | 157 | struct inet_diag_req_v2 *r, struct nlattr *bc) |
158 | { | 158 | { |
159 | udp_dump(&udplite_table, skb, cb, r, bc); | 159 | udp_dump(&udplite_table, skb, cb, r, bc); |
160 | } | 160 | } |
161 | 161 | ||
162 | static int udplite_diag_dump_one(struct sk_buff *in_skb, const struct nlmsghdr *nlh, | 162 | static int udplite_diag_dump_one(struct sk_buff *in_skb, const struct nlmsghdr *nlh, |
163 | struct inet_diag_req *req) | 163 | struct inet_diag_req_v2 *req) |
164 | { | 164 | { |
165 | return udp_dump_one(&udplite_table, in_skb, nlh, req); | 165 | return udp_dump_one(&udplite_table, in_skb, nlh, req); |
166 | } | 166 | } |