Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[firefly-linux-kernel-4.4.55.git] / include / net / ip.h

diff --git a/include/net/ip.h b/include/net/ip.h
index acf8b7814c4e58224a4f05c89b490e25481e477e..66dd4914920858037c617abedd369f52ed8dc156 100644 (file)
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -106,7 +106,7 @@ extern int          __ip_local_out(struct sk_buff *skb);
 extern int             ip_local_out(struct sk_buff *skb);
 extern int             ip_queue_xmit(struct sk_buff *skb, struct flowi *fl);
 extern void            ip_init(void);
-extern int             ip_append_data(struct sock *sk,
+extern int             ip_append_data(struct sock *sk, struct flowi4 *fl4,
                                       int getfrag(void *from, char *to, int offset, int len,
                                                   int odd, struct sk_buff *skb),
                                void *from, int len, int protolen,
@@ -114,15 +114,17 @@ extern int                ip_append_data(struct sock *sk,
                                struct rtable **rt,
                                unsigned int flags);
 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,
+extern ssize_t         ip_append_page(struct sock *sk, struct flowi4 *fl4, struct page *page,
                                int offset, size_t size, int flags);
 extern struct sk_buff  *__ip_make_skb(struct sock *sk,
+                                     struct flowi4 *fl4,
                                      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 int             ip_push_pending_frames(struct sock *sk, struct flowi4 *fl4);
 extern void            ip_flush_pending_frames(struct sock *sk);
 extern struct sk_buff  *ip_make_skb(struct sock *sk,
+                                   struct flowi4 *fl4,
                                    int getfrag(void *from, char *to, int offset, int len,
                                                int odd, struct sk_buff *skb),
                                    void *from, int length, int transhdrlen,
@@ -130,9 +132,9 @@ extern struct sk_buff  *ip_make_skb(struct sock *sk,
                                    struct rtable **rtp,
                                    unsigned int flags);
 
-static inline struct sk_buff *ip_finish_skb(struct sock *sk)
+static inline struct sk_buff *ip_finish_skb(struct sock *sk, struct flowi4 *fl4)
 {
-       return __ip_make_skb(sk, &sk->sk_write_queue, &inet_sk(sk)->cork.base);
+       return __ip_make_skb(sk, fl4, &sk->sk_write_queue, &inet_sk(sk)->cork.base);
 }
 
 /* datagram.c */
@@ -172,8 +174,8 @@ static inline __u8 ip_reply_arg_flowi_flags(const struct ip_reply_arg *arg)
        return (arg->flags & IP_REPLY_ARG_NOSRCCHECK) ? FLOWI_FLAG_ANYSRC : 0;
 }
 
-void ip_send_reply(struct sock *sk, struct sk_buff *skb, struct ip_reply_arg *arg,
-                  unsigned int len); 
+void ip_send_reply(struct sock *sk, struct sk_buff *skb, __be32 daddr,
+                  struct ip_reply_arg *arg, unsigned int len);
 
 struct ipv4_config {
        int     log_martians;