Merge branches 'release' and 'hp-cid' into release

[linux-2.6] / net / ipv6 / udplite.c

diff --git a/net/ipv6/udplite.c b/net/ipv6/udplite.c
index f20b376689fb62b39ead25d7b319aa82d3431ceb..87d4202522ee167400f6ee2121c407c68315a91c 100644 (file)
--- a/net/ipv6/udplite.c
+++ b/net/ipv6/udplite.c
@@ -26,7 +26,7 @@ static void udplitev6_err(struct sk_buff *skb,
                          struct inet6_skb_parm *opt,
                          int type, int code, int offset, __be32 info)
 {
-       return __udp6_lib_err(skb, opt, type, code, offset, info, udplite_hash);
+       __udp6_lib_err(skb, opt, type, code, offset, info, udplite_hash);
 }
 
 static struct inet6_protocol udplitev6_protocol = {
@@ -96,7 +96,7 @@ out_udplitev6_protocol:
        goto out;
 }
 
-void __exit udplitev6_exit(void)
+void udplitev6_exit(void)
 {
        inet6_unregister_protosw(&udplite6_protosw);
        inet6_del_protocol(&udplitev6_protocol, IPPROTO_UDPLITE);