Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 3 insertions, 7 deletions

diff --git a/include/net/transp_v6.h b/include/net/transp_v6.h
index 42a0eb68b7b6..5271a741c3a3 100644
--- a/include/net/transp_v6.h
+++ b/include/net/transp_v6.h
@@ -7,16 +7,14 @@
  *      IPv6 transport protocols
  */
 
-#ifdef __KERNEL__
-
 extern struct proto rawv6_prot;
 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 +40,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);
@@ -57,5 +55,3 @@ extern const struct inet_connection_sock_af_ops ipv4_specific;
 extern void inet6_destroy_sock(struct sock *sk);
 
 #endif
-
-#endif