Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[linux-2.6-block.git] / include / net / ip.h

diff --git a/include/net/ip.h b/include/net/ip.h
index 67fac78a186b147c816a5aa0ae50fd1c3d1f2f72..a4f631108c54eec5e80b4cb6c44b69fc0f984e6f 100644 (file)
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -116,8 +116,24 @@ extern int         ip_append_data(struct sock *sk,
 extern int             ip_generic_getfrag(void *from, char *to, int offset, int len, int odd, struct sk_buff *skb);
 extern ssize_t         ip_append_page(struct sock *sk, struct page *page,
                                int offset, size_t size, int flags);
+extern struct sk_buff  *__ip_make_skb(struct sock *sk,
+                                     struct sk_buff_head *queue,
+                                     struct inet_cork *cork);
+extern int             ip_send_skb(struct sk_buff *skb);
 extern int             ip_push_pending_frames(struct sock *sk);
 extern void            ip_flush_pending_frames(struct sock *sk);
+extern struct sk_buff  *ip_make_skb(struct sock *sk,
+                                   int getfrag(void *from, char *to, int offset, int len,
+                                               int odd, struct sk_buff *skb),
+                                   void *from, int length, int transhdrlen,
+                                   struct ipcm_cookie *ipc,
+                                   struct rtable **rtp,
+                                   unsigned int flags);
+
+static inline struct sk_buff *ip_finish_skb(struct sock *sk)
+{
+       return __ip_make_skb(sk, &sk->sk_write_queue, &inet_sk(sk)->cork);
+}
 
 /* datagram.c */
 extern int             ip4_datagram_connect(struct sock *sk,