Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b09c84c authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

inet_diag: Rename inet_diag_req_compat into inet_diag_req 



Signed-off-by: default avatarPavel Emelyanov <xemul@parallels.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c8991362

include/linux/inet_diag.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

net/ipv4/inet_diag.c

+4 −4
Original line number Diff line number Diff line
@@ -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)