diff options
Diffstat (limited to 'include/linux/skbuff.h')
| -rw-r--r-- | include/linux/skbuff.h | 24 | 
1 files changed, 19 insertions, 5 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 33370271b8b..111f26b6e28 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -238,11 +238,12 @@ enum {  /*   * The callback notifies userspace to release buffers when skb DMA is done in   * lower device, the skb last reference should be 0 when calling this. - * The desc is used to track userspace buffer index. + * The ctx field is used to track device context. + * The desc field is used to track userspace buffer index.   */  struct ubuf_info { -	void (*callback)(void *); -	void *arg; +	void (*callback)(struct ubuf_info *); +	void *ctx;  	unsigned long desc;  }; @@ -481,6 +482,7 @@ struct sk_buff {  	union {  		__u32		mark;  		__u32		dropcount; +		__u32		avail_size;  	};  	sk_buff_data_t		transport_header; @@ -1018,7 +1020,7 @@ static inline void skb_queue_splice(const struct sk_buff_head *list,  }  /** - *	skb_queue_splice - join two skb lists and reinitialise the emptied list + *	skb_queue_splice_init - join two skb lists and reinitialise the emptied list   *	@list: the new list to add   *	@head: the place to add it in the first list   * @@ -1049,7 +1051,7 @@ static inline void skb_queue_splice_tail(const struct sk_buff_head *list,  }  /** - *	skb_queue_splice_tail - join two skb lists and reinitialise the emptied list + *	skb_queue_splice_tail_init - join two skb lists and reinitialise the emptied list   *	@list: the new list to add   *	@head: the place to add it in the first list   * @@ -1366,6 +1368,18 @@ static inline int skb_tailroom(const struct sk_buff *skb)  }  /** + *	skb_availroom - bytes at buffer end + *	@skb: buffer to check + * + *	Return the number of bytes of free space at the tail of an sk_buff + *	allocated by sk_stream_alloc() + */ +static inline int skb_availroom(const struct sk_buff *skb) +{ +	return skb_is_nonlinear(skb) ? 0 : skb->avail_size - skb->len; +} + +/**   *	skb_reserve - adjust headroom   *	@skb: buffer to alter   *	@len: bytes to move  |