Merge branch 'restriper' of git://github.com/idryomov/btrfs-unstable into integration

[~andy/linux] / include / net / ipv6.h

diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 3b5ac1fbff39f50c51e55b07bd743172d1a9e0e5..a366a8a1fe2380e92ce604a21d44e8e598e484f4 100644 (file)
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -486,7 +486,8 @@ extern int                  ip6_rcv_finish(struct sk_buff *skb);
 extern int                     ip6_xmit(struct sock *sk,
                                         struct sk_buff *skb,
                                         struct flowi6 *fl6,
-                                        struct ipv6_txoptions *opt);
+                                        struct ipv6_txoptions *opt,
+                                        int tclass);
 
 extern int                     ip6_nd_hdr(struct sock *sk,
                                           struct sk_buff *skb,