diff options
author | Pavel Emelyanov <xemul@parallels.com> | 2012-01-10 17:37:26 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-01-11 15:56:06 -0500 |
commit | 3b09c84cb622ffbcdb5d541986b1eaf7d5812602 (patch) | |
tree | 5c322a4985f97c1360cf8877e8c70f8a0875dab0 /net | |
parent | c8991362a0d3cf317dfbfb6cb946607870654e6d (diff) |
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>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/inet_diag.c | 8 |
1 files changed, 4 insertions, 4 deletions
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) | |||
909 | 909 | ||
910 | static int inet_diag_dump_compat(struct sk_buff *skb, struct netlink_callback *cb) | 910 | static int inet_diag_dump_compat(struct sk_buff *skb, struct netlink_callback *cb) |
911 | { | 911 | { |
912 | struct inet_diag_req_compat *rc = NLMSG_DATA(cb->nlh); | 912 | struct inet_diag_req *rc = NLMSG_DATA(cb->nlh); |
913 | struct inet_diag_req_v2 req; | 913 | struct inet_diag_req_v2 req; |
914 | struct nlattr *bc = NULL; | 914 | struct nlattr *bc = NULL; |
915 | int hdrlen = sizeof(struct inet_diag_req_compat); | 915 | int hdrlen = sizeof(struct inet_diag_req); |
916 | 916 | ||
917 | req.sdiag_family = AF_UNSPEC; /* compatibility */ | 917 | req.sdiag_family = AF_UNSPEC; /* compatibility */ |
918 | req.sdiag_protocol = inet_diag_type2proto(cb->nlh->nlmsg_type); | 918 | 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 | |||
929 | static int inet_diag_get_exact_compat(struct sk_buff *in_skb, | 929 | static int inet_diag_get_exact_compat(struct sk_buff *in_skb, |
930 | const struct nlmsghdr *nlh) | 930 | const struct nlmsghdr *nlh) |
931 | { | 931 | { |
932 | struct inet_diag_req_compat *rc = NLMSG_DATA(nlh); | 932 | struct inet_diag_req *rc = NLMSG_DATA(nlh); |
933 | struct inet_diag_req_v2 req; | 933 | struct inet_diag_req_v2 req; |
934 | 934 | ||
935 | req.sdiag_family = rc->idiag_family; | 935 | req.sdiag_family = rc->idiag_family; |
@@ -943,7 +943,7 @@ static int inet_diag_get_exact_compat(struct sk_buff *in_skb, | |||
943 | 943 | ||
944 | static int inet_diag_rcv_msg_compat(struct sk_buff *skb, struct nlmsghdr *nlh) | 944 | static int inet_diag_rcv_msg_compat(struct sk_buff *skb, struct nlmsghdr *nlh) |
945 | { | 945 | { |
946 | int hdrlen = sizeof(struct inet_diag_req_compat); | 946 | int hdrlen = sizeof(struct inet_diag_req); |
947 | 947 | ||
948 | if (nlh->nlmsg_type >= INET_DIAG_GETSOCK_MAX || | 948 | if (nlh->nlmsg_type >= INET_DIAG_GETSOCK_MAX || |
949 | nlmsg_len(nlh) < hdrlen) | 949 | nlmsg_len(nlh) < hdrlen) |