Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull in the 'net' tree to get Daniel Borkmann's flow dissector infrastructure change. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@ -766,7 +766,7 @@ struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp)
|
||||
* Make sure that we have exactly size bytes
|
||||
* available to the caller, no more, no less.
|
||||
*/
|
||||
skb->avail_size = size;
|
||||
skb->reserved_tailroom = skb->end - skb->tail - size;
|
||||
return skb;
|
||||
}
|
||||
__kfree_skb(skb);
|
||||
|
Reference in New Issue
Block a user