summaryrefslogtreecommitdiff
path: root/include/net/inet6_connection_sock.h
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-02-07 06:05:13 +0300
committerPaul Mackerras <paulus@samba.org>2007-02-07 06:05:13 +0300
commit8423200553113cc031caa9b147f6150a8e26545c (patch)
tree752c93a200c9ba056c7469c96f7e27d02c99291d /include/net/inet6_connection_sock.h
parentf03e64f2ca6ee3d0b7824536b1940497701fe766 (diff)
parent62d0cfcb27cf755cebdc93ca95dabc83608007cd (diff)
downloadlinux-8423200553113cc031caa9b147f6150a8e26545c.tar.xz
Merge branch 'linux-2.6'
Diffstat (limited to 'include/net/inet6_connection_sock.h')
-rw-r--r--include/net/inet6_connection_sock.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/inet6_connection_sock.h b/include/net/inet6_connection_sock.h
index 16aa96a6a53b..f13ddc2543b1 100644
--- a/include/net/inet6_connection_sock.h
+++ b/include/net/inet6_connection_sock.h
@@ -38,5 +38,5 @@ extern void inet6_csk_reqsk_queue_hash_add(struct sock *sk,
extern void inet6_csk_addr2sockaddr(struct sock *sk, struct sockaddr *uaddr);
-extern int inet6_csk_xmit(struct sk_buff *skb, struct sock *sk, int ipfragok);
+extern int inet6_csk_xmit(struct sk_buff *skb, int ipfragok);
#endif /* _INET6_CONNECTION_SOCK_H */