Commit 4cc7f68d authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

net: Reexport sock_alloc_send_pskb 



The function sock_alloc_send_pskb is completely useless if not
exported since most of the code in it won't be used as is.  In
fact, this code has already been duplicated in the tun driver.

Now that we need accounting in the tun driver, we can in fact
use this function as is.  So this patch marks it for export again.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9a279bcb

include/net/sock.h

+5 −0
Original line number Diff line number Diff line
@@ -945,6 +945,11 @@ extern struct sk_buff *sock_alloc_send_skb(struct sock *sk, 
						     unsigned long size,

						     int noblock,

						     int *errcode);

extern struct sk_buff 		*sock_alloc_send_pskb(struct sock *sk,

						      unsigned long header_len,

						      unsigned long data_len,

						      int noblock,

						      int *errcode);

extern void *sock_kmalloc(struct sock *sk, int size,

			  gfp_t priority);

extern void sock_kfree_s(struct sock *sk, void *mem, int size);

net/core/sock.c

+4 −4
Original line number Diff line number Diff line
@@ -1254,10 +1254,9 @@ static long sock_wait_for_wmem(struct sock * sk, long timeo) 
 *	Generic send/receive buffer handlers

 */



static struct sk_buff *sock_alloc_send_pskb(struct sock *sk,

					    unsigned long header_len,

					    unsigned long data_len,

					    int noblock, int *errcode)

struct sk_buff *sock_alloc_send_pskb(struct sock *sk, unsigned long header_len,

				     unsigned long data_len, int noblock,

				     int *errcode)

{

	struct sk_buff *skb;

	gfp_t gfp_mask;
@@ -1337,6 +1336,7 @@ failure: 
	*errcode = err;

	return NULL;

}

EXPORT_SYMBOL(sock_alloc_send_pskb);



struct sk_buff *sock_alloc_send_skb(struct sock *sk, unsigned long size,

				    int noblock, int *errcode)

CRA Git | Maintained and supported by SUSTech CRA and CCSE