From cecec6b6b57ff6b4b847108bb67d288f7340eef5 Mon Sep 17 00:00:00 2001 From: Rami Rosen Date: Thu, 27 Mar 2008 17:39:19 -0700 Subject: [PATCH] --- yaml --- r: 90415 b: refs/heads/master c: 4f95165d4bf6369d57052d60cc0266c569c6b077 h: refs/heads/master i: 90413: 5f4d020b23e8f1879c25286a50bedae41c5e44eb 90411: 715e61020ec90bb6f3006c0e649686e0096c7fa7 90407: 773458e8532b099cf0c180122351768394bcfb10 90399: 57a66cc7856779d300b80b009bdefee7f242aa20 v: v3 --- [refs] | 2 +- trunk/include/net/ipv6.h | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/[refs] b/[refs] index 89d63f33f507..1f0677bb54c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 09382bac667821017144de6b733a26f29a1c185b +refs/heads/master: 4f95165d4bf6369d57052d60cc0266c569c6b077 diff --git a/trunk/include/net/ipv6.h b/trunk/include/net/ipv6.h index 296f61d84709..5738c1c73ac1 100644 --- a/trunk/include/net/ipv6.h +++ b/trunk/include/net/ipv6.h @@ -250,15 +250,6 @@ int ip6_frag_mem(struct net *net); #define IPV6_FRAG_TIMEOUT (60*HZ) /* 60 seconds */ -/* - * Function prototype for build_xmit - */ - -typedef int (*inet_getfrag_t) (const void *data, - struct in6_addr *addr, - char *, - unsigned int, unsigned int); - extern int __ipv6_addr_type(const struct in6_addr *addr); static inline int ipv6_addr_type(const struct in6_addr *addr) { @@ -510,14 +501,6 @@ extern int ip6_local_out(struct sk_buff *skb); * Extension header (options) processing */ -extern u8 * ipv6_build_nfrag_opts(struct sk_buff *skb, - u8 *prev_hdr, - struct ipv6_txoptions *opt, - struct in6_addr *daddr, - u32 jumbolen); -extern u8 * ipv6_build_frag_opts(struct sk_buff *skb, - u8 *prev_hdr, - struct ipv6_txoptions *opt); extern void ipv6_push_nfrag_opts(struct sk_buff *skb, struct ipv6_txoptions *opt, u8 *proto,