Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

[linux-2.6-omap-h63xx.git] / include / net / sock.h

diff --git a/include/net/sock.h b/include/net/sock.h
index ce3b5b6226838ca1d1595b519d02e6223efcb67b..ded6854e3e4a961cc9b4438810c4191804a0133c 100644 (file)
--- 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,
                                                     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);