Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

inet_diag: Rename inet_diag_req_compat into inet_diag_req

Browse source 
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pavel Emelyanov 2012-01-10 22:37:26 +00:00 • committed by David S. Miller
parent c8991362a0
commit 3b09c84cb6
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/linux/inet_diag.h
View file

@ -22,7 +22,7 @@ struct inet_diag_sockid {
/* Request structure */ /* Request structure */
struct inet_diag_req_compat { struct inet_diag_req {
__u8 idiag_family; /* Family of addresses. */ __u8 idiag_family; /* Family of addresses. */
__u8 idiag_src_len; __u8 idiag_src_len;
__u8 idiag_dst_len; __u8 idiag_dst_len;

8
net/ipv4/inet_diag.c
View file

@ -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) 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 inet_diag_req_v2 req;
struct nlattr *bc = NULL; 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_family = AF_UNSPEC; /* compatibility */
req.sdiag_protocol = inet_diag_type2proto(cb->nlh->nlmsg_type); 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, static int inet_diag_get_exact_compat(struct sk_buff *in_skb,
const struct nlmsghdr *nlh) 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; struct inet_diag_req_v2 req;
req.sdiag_family = rc->idiag_family; 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) 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 || if (nlh->nlmsg_type >= INET_DIAG_GETSOCK_MAX ||
nlmsg_len(nlh) < hdrlen) nlmsg_len(nlh) < hdrlen)