inet_diag: Rename inet_diag_req_compat into inet_diag_req

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 5 insertions, 5 deletions

diff --git a/include/linux/inet_diag.h b/include/linux/inet_diag.h
index a5b7e910eea9..f1362b5447fc 100644
--- a/include/linux/inet_diag.h
+++ b/include/linux/inet_diag.h
@@ -22,7 +22,7 @@ struct inet_diag_sockid {
 
 /* Request structure */
 
-struct inet_diag_req_compat {
+struct inet_diag_req {
         __u8    idiag_family;           /* Family of addresses. */
         __u8    idiag_src_len;
         __u8    idiag_dst_len;
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
index cf23a7cacdd4..fcf281819cd4 100644
--- a/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
@@ -909,10 +909,10 @@ static inline int inet_diag_type2proto(int type)
 
 static int inet_diag_dump_compat(struct sk_buff *skb, struct netlink_callback *cb)
 {
-        struct inet_diag_req_compat *rc = NLMSG_DATA(cb->nlh);
+        struct inet_diag_req *rc = NLMSG_DATA(cb->nlh);
         struct inet_diag_req_v2 req;
         struct nlattr *bc = NULL;
-        int hdrlen = sizeof(struct inet_diag_req_compat);
+        int hdrlen = sizeof(struct inet_diag_req);
 
         req.sdiag_family = AF_UNSPEC; /* compatibility */
         req.sdiag_protocol = inet_diag_type2proto(cb->nlh->nlmsg_type);
@@ -929,7 +929,7 @@ static int inet_diag_dump_compat(struct sk_buff *skb, struct netlink_callback *c
 static int inet_diag_get_exact_compat(struct sk_buff *in_skb,
                                const struct nlmsghdr *nlh)
 {
-        struct inet_diag_req_compat *rc = NLMSG_DATA(nlh);
+        struct inet_diag_req *rc = NLMSG_DATA(nlh);
         struct inet_diag_req_v2 req;
 
         req.sdiag_family = rc->idiag_family;
@@ -943,7 +943,7 @@ static int inet_diag_get_exact_compat(struct sk_buff *in_skb,
 
 static int inet_diag_rcv_msg_compat(struct sk_buff *skb, struct nlmsghdr *nlh)
 {
-        int hdrlen = sizeof(struct inet_diag_req_compat);
+        int hdrlen = sizeof(struct inet_diag_req);
 
         if (nlh->nlmsg_type >= INET_DIAG_GETSOCK_MAX ||
             nlmsg_len(nlh) < hdrlen)