diff options
author | David S. Miller | 2017-06-20 19:30:16 +0200 |
---|---|---|
committer | David S. Miller | 2017-06-20 19:30:16 +0200 |
commit | c0ca9e7201c4507e70c4d71c1997c410651fe3c5 (patch) | |
tree | fda132505741ee4d859ae09f45966656ea557572 /net/x25/x25_subr.c | |
parent | net: dsa: mv88e6xxx: better IEEE Prio Mapping Table description (diff) | |
parent | net: manual clean code which call skb_put_[data:zero] (diff) | |
download | kernel-qcow2-linux-c0ca9e7201c4507e70c4d71c1997c410651fe3c5.tar.gz kernel-qcow2-linux-c0ca9e7201c4507e70c4d71c1997c410651fe3c5.tar.xz kernel-qcow2-linux-c0ca9e7201c4507e70c4d71c1997c410651fe3c5.zip |
Merge branch 'net-more-skb_put-work'
yuan linyu says:
====================
net: more skb_put_[data:zero] related work
yuan linyu (3):
net: introduce __skb_put_[zero, data, u8]
net: replace more place to skb_put_[data:zero]
net: manual clean code which call skb_put_[data:zero]
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/x25/x25_subr.c')
-rw-r--r-- | net/x25/x25_subr.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/x25/x25_subr.c b/net/x25/x25_subr.c index eb466ece1730..db0b1315d577 100644 --- a/net/x25/x25_subr.c +++ b/net/x25/x25_subr.c @@ -188,14 +188,14 @@ void x25_write_internal(struct sock *sk, int frametype) *dptr++ = X25_CALL_REQUEST; len = x25_addr_aton(addresses, &x25->dest_addr, &x25->source_addr); - dptr = skb_put_data(skb, addresses, len); + skb_put_data(skb, addresses, len); len = x25_create_facilities(facilities, &x25->facilities, &x25->dte_facilities, x25->neighbour->global_facil_mask); - dptr = skb_put_data(skb, facilities, len); - dptr = skb_put_data(skb, x25->calluserdata.cuddata, - x25->calluserdata.cudlength); + skb_put_data(skb, facilities, len); + skb_put_data(skb, x25->calluserdata.cuddata, + x25->calluserdata.cudlength); x25->calluserdata.cudlength = 0; break; @@ -207,15 +207,15 @@ void x25_write_internal(struct sock *sk, int frametype) &x25->facilities, &x25->dte_facilities, x25->vc_facil_mask); - dptr = skb_put_data(skb, facilities, len); + skb_put_data(skb, facilities, len); /* fast select with no restriction on response allows call user data. Userland must ensure it is ours and not theirs */ if(x25->facilities.reverse & 0x80) { - dptr = skb_put_data(skb, - x25->calluserdata.cuddata, - x25->calluserdata.cudlength); + skb_put_data(skb, + x25->calluserdata.cuddata, + x25->calluserdata.cudlength); } x25->calluserdata.cudlength = 0; break; |