Merge commit 'v2.6.39-rc4' into next

1 files changed, 3 insertions, 3 deletions

diff --git a/include/net/transp_v6.h b/include/net/transp_v6.h
index 42a0eb68b7b6..a8122dc56410 100644
--- a/include/net/transp_v6.h
+++ b/include/net/transp_v6.h
@@ -14,9 +14,9 @@ extern struct proto udpv6_prot;
 extern struct proto udplitev6_prot;
 extern struct proto tcpv6_prot;
 
-struct flowi;
+struct flowi6;
 
-/* extention headers */
+/* extension headers */
 extern int                              ipv6_exthdrs_init(void);
 extern void                             ipv6_exthdrs_exit(void);
 extern int                              ipv6_frag_init(void);
@@ -42,7 +42,7 @@ extern int			datagram_recv_ctl(struct sock *sk,
 
 extern int                      datagram_send_ctl(struct net *net,
                                                   struct msghdr *msg,
-                                                  struct flowi *fl,
+                                                  struct flowi6 *fl6,
                                                   struct ipv6_txoptions *opt,
                                                   int *hlimit, int *tclass,
                                                   int *dontfrag);