diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-03-14 21:04:34 -0300 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-25 22:25:59 -0700 |
commit | eeeb03745bf9ea352df2373b9cb5fa14e60a2de0 (patch) | |
tree | e3b66df5536f04b81f0f2432399785931f20263d /net/x25 | |
parent | ac6d141dc7d1d0eeec850d1b451dca83ce649684 (diff) | |
download | linux-stable-eeeb03745bf9ea352df2373b9cb5fa14e60a2de0.tar.gz linux-stable-eeeb03745bf9ea352df2373b9cb5fa14e60a2de0.tar.bz2 linux-stable-eeeb03745bf9ea352df2373b9cb5fa14e60a2de0.zip |
[SK_BUFF]: More skb_put related conversions to skb_reset_transport_header
This is similar to the skb_reset_network_header(), i.e. at the point we reset
the transport header pointer/offset skb->tail is equal to skb->data.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/x25')
-rw-r--r-- | net/x25/af_x25.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index fc713059ccdd..adcda8ebee9c 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -1058,9 +1058,10 @@ static int x25_sendmsg(struct kiocb *iocb, struct socket *sock, */ SOCK_DEBUG(sk, "x25_sendmsg: Copying user data\n"); - asmptr = skb->h.raw = skb_put(skb, len); + skb_reset_transport_header(skb); + skb_put(skb, len); - rc = memcpy_fromiovec(asmptr, msg->msg_iov, len); + rc = memcpy_fromiovec(skb_transport_header(skb), msg->msg_iov, len); if (rc) goto out_kfree_skb; |