aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2009-02-04 19:55:54 -0500
committerDavid S. Miller <davem@davemloft.net>2009-02-04 19:55:54 -0500
commit4cc7f68d65558f683c702d4fe3a5aac4c5227b97 (patch)
tree88f2987e503790d2015a7f0a3b5748d05a0df140
parent9a279bcbe347496799711155ed41a89bc40f79c5 (diff)
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: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/sock.h5
-rw-r--r--net/core/sock.c8
2 files changed, 9 insertions, 4 deletions
diff --git a/include/net/sock.h b/include/net/sock.h
index 5a3a151bd730..c047def9cf10 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -945,6 +945,11 @@ extern struct sk_buff *sock_alloc_send_skb(struct sock *sk,
945 unsigned long size, 945 unsigned long size,
946 int noblock, 946 int noblock,
947 int *errcode); 947 int *errcode);
948extern struct sk_buff *sock_alloc_send_pskb(struct sock *sk,
949 unsigned long header_len,
950 unsigned long data_len,
951 int noblock,
952 int *errcode);
948extern void *sock_kmalloc(struct sock *sk, int size, 953extern void *sock_kmalloc(struct sock *sk, int size,
949 gfp_t priority); 954 gfp_t priority);
950extern void sock_kfree_s(struct sock *sk, void *mem, int size); 955extern void sock_kfree_s(struct sock *sk, void *mem, int size);
diff --git a/net/core/sock.c b/net/core/sock.c
index f3a0d08cbb48..c64996f8a27a 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1254,10 +1254,9 @@ static long sock_wait_for_wmem(struct sock * sk, long timeo)
1254 * Generic send/receive buffer handlers 1254 * Generic send/receive buffer handlers
1255 */ 1255 */
1256 1256
1257static struct sk_buff *sock_alloc_send_pskb(struct sock *sk, 1257struct sk_buff *sock_alloc_send_pskb(struct sock *sk, unsigned long header_len,
1258 unsigned long header_len, 1258 unsigned long data_len, int noblock,
1259 unsigned long data_len, 1259 int *errcode)
1260 int noblock, int *errcode)
1261{ 1260{
1262 struct sk_buff *skb; 1261 struct sk_buff *skb;
1263 gfp_t gfp_mask; 1262 gfp_t gfp_mask;
@@ -1337,6 +1336,7 @@ failure:
1337 *errcode = err; 1336 *errcode = err;
1338 return NULL; 1337 return NULL;
1339} 1338}
1339EXPORT_SYMBOL(sock_alloc_send_pskb);
1340 1340
1341struct sk_buff *sock_alloc_send_skb(struct sock *sk, unsigned long size, 1341struct sk_buff *sock_alloc_send_skb(struct sock *sk, unsigned long size,
1342 int noblock, int *errcode) 1342 int noblock, int *errcode)