Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c7ddf36 authored by Mathias Krause's avatar Mathias Krause Committed by David S. Miller
Browse files

net: move pskb_put() to core code 



This function has usage beside IPsec so move it to the core skbuff code.
While doing so, give it some documentation and change its return type to
'unsigned char *' to be in line with skb_put().

Signed-off-by: default avatarMathias Krause <mathias.krause@secunet.com>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b5ad795e

include/linux/skbuff.h

+1 −0
Original line number Diff line number Diff line
@@ -1417,6 +1417,7 @@ static inline void skb_set_tail_pointer(struct sk_buff *skb, const int offset) 
/*

 *	Add data to an sk_buff

 */

unsigned char *pskb_put(struct sk_buff *skb, struct sk_buff *tail, int len);

unsigned char *skb_put(struct sk_buff *skb, unsigned int len);

static inline unsigned char *__skb_put(struct sk_buff *skb, unsigned int len)

{

include/net/esp.h

+0 −2
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ 


#include <linux/skbuff.h>



void *pskb_put(struct sk_buff *skb, struct sk_buff *tail, int len);



struct ip_esp_hdr;



static inline struct ip_esp_hdr *ip_esp_hdr(const struct sk_buff *skb)

net/core/skbuff.c

+23 −0
Original line number Diff line number Diff line
@@ -1263,6 +1263,29 @@ free_skb: 
}

EXPORT_SYMBOL(skb_pad);



/**

 *	pskb_put - add data to the tail of a potentially fragmented buffer

 *	@skb: start of the buffer to use

 *	@tail: tail fragment of the buffer to use

 *	@len: amount of data to add

 *

 *	This function extends the used data area of the potentially

 *	fragmented buffer. @tail must be the last fragment of @skb -- or

 *	@skb itself. If this would exceed the total buffer size the kernel

 *	will panic. A pointer to the first byte of the extra data is

 *	returned.

 */



unsigned char *pskb_put(struct sk_buff *skb, struct sk_buff *tail, int len)

{

	if (tail != skb) {

		skb->data_len += len;

		skb->len += len;

	}

	return skb_put(tail, len);

}

EXPORT_SYMBOL_GPL(pskb_put);



/**

 *	skb_put - add data to a buffer

 *	@skb: buffer to use

net/xfrm/xfrm_algo.c

+0 −13
Original line number Diff line number Diff line
@@ -802,17 +802,4 @@ int xfrm_count_pfkey_enc_supported(void) 
}

EXPORT_SYMBOL_GPL(xfrm_count_pfkey_enc_supported);



#if defined(CONFIG_INET_ESP) || defined(CONFIG_INET_ESP_MODULE) || defined(CONFIG_INET6_ESP) || defined(CONFIG_INET6_ESP_MODULE)



void *pskb_put(struct sk_buff *skb, struct sk_buff *tail, int len)

{

	if (tail != skb) {

		skb->data_len += len;

		skb->len += len;

	}

	return skb_put(tail, len);

}

EXPORT_SYMBOL_GPL(pskb_put);

#endif



MODULE_LICENSE("GPL");