projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SK_BUFF]: Convert skb->tail to sk_buff_data_t
[deliverable/linux.git]
/
net
/
ipv4
/
inet_diag.c
diff --git
a/net/ipv4/inet_diag.c
b/net/ipv4/inet_diag.c
index 5df71cd08da811e65b354abb82ed9103664d0e73..37362cd1d07fd135e5d3468220fa1ca66fa6a49b 100644
(file)
--- a/
net/ipv4/inet_diag.c
+++ b/
net/ipv4/inet_diag.c
@@
-60,7
+60,7
@@
static int inet_csk_diag_fill(struct sock *sk,
struct nlmsghdr *nlh;
void *info = NULL;
struct inet_diag_meminfo *minfo = NULL;
struct nlmsghdr *nlh;
void *info = NULL;
struct inet_diag_meminfo *minfo = NULL;
- unsigned char *b = skb
->tail
;
+ unsigned char *b = skb
_tail_pointer(skb)
;
const struct inet_diag_handler *handler;
handler = inet_diag_table[unlh->nlmsg_type];
const struct inet_diag_handler *handler;
handler = inet_diag_table[unlh->nlmsg_type];
@@
-147,7
+147,7
@@
static int inet_csk_diag_fill(struct sock *sk,
icsk->icsk_ca_ops && icsk->icsk_ca_ops->get_info)
icsk->icsk_ca_ops->get_info(sk, ext, skb);
icsk->icsk_ca_ops && icsk->icsk_ca_ops->get_info)
icsk->icsk_ca_ops->get_info(sk, ext, skb);
- nlh->nlmsg_len = skb
->tail
- b;
+ nlh->nlmsg_len = skb
_tail_pointer(skb)
- b;
return skb->len;
rtattr_failure:
return skb->len;
rtattr_failure:
@@
-163,7
+163,7
@@
static int inet_twsk_diag_fill(struct inet_timewait_sock *tw,
{
long tmo;
struct inet_diag_msg *r;
{
long tmo;
struct inet_diag_msg *r;
- const unsigned char *previous_tail = skb
->tail
;
+ const unsigned char *previous_tail = skb
_tail_pointer(skb)
;
struct nlmsghdr *nlh = NLMSG_PUT(skb, pid, seq,
unlh->nlmsg_type, sizeof(*r));
struct nlmsghdr *nlh = NLMSG_PUT(skb, pid, seq,
unlh->nlmsg_type, sizeof(*r));
@@
-205,7
+205,7
@@
static int inet_twsk_diag_fill(struct inet_timewait_sock *tw,
&tw6->tw_v6_daddr);
}
#endif
&tw6->tw_v6_daddr);
}
#endif
- nlh->nlmsg_len = skb
->tail
- previous_tail;
+ nlh->nlmsg_len = skb
_tail_pointer(skb)
- previous_tail;
return skb->len;
nlmsg_failure:
skb_trim(skb, previous_tail - skb->data);
return skb->len;
nlmsg_failure:
skb_trim(skb, previous_tail - skb->data);
@@
-535,7
+535,7
@@
static int inet_diag_fill_req(struct sk_buff *skb, struct sock *sk,
{
const struct inet_request_sock *ireq = inet_rsk(req);
struct inet_sock *inet = inet_sk(sk);
{
const struct inet_request_sock *ireq = inet_rsk(req);
struct inet_sock *inet = inet_sk(sk);
- unsigned char *b = skb
->tail
;
+ unsigned char *b = skb
_tail_pointer(skb)
;
struct inet_diag_msg *r;
struct nlmsghdr *nlh;
long tmo;
struct inet_diag_msg *r;
struct nlmsghdr *nlh;
long tmo;
@@
-574,7
+574,7
@@
static int inet_diag_fill_req(struct sk_buff *skb, struct sock *sk,
&inet6_rsk(req)->rmt_addr);
}
#endif
&inet6_rsk(req)->rmt_addr);
}
#endif
- nlh->nlmsg_len = skb
->tail
- b;
+ nlh->nlmsg_len = skb
_tail_pointer(skb)
- b;
return skb->len;
return skb->len;
This page took
0.038408 seconds
and
5
git commands to generate.