Skip to content

Commit

Permalink
inet_diag: Rename inet_diag_req_compat into inet_diag_req
Browse files Browse the repository at this point in the history
Signed-off-by: Pavel Emelyanov <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
xemul authored and davem330 committed Jan 11, 2012
1 parent c899136 commit 3b09c84
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion include/linux/inet_diag.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions net/ipv4/inet_diag.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
Expand All @@ -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)
Expand Down

0 comments on commit 3b09c84

Please sign in to comment.