[IPV6]: Make fib6_init to return an error code.

[linux-2.6] / include / net / netlink.h

diff --git a/include/net/netlink.h b/include/net/netlink.h
index 1afd3e837d2328f15950b79608d59291550f3b88..db4b935b6c7e3b26ec746bf17c467b0ec872d042 100644 (file)
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
@@ -220,9 +220,9 @@ struct nl_info {
        u32                     pid;
 };
 
-extern unsigned int    netlink_run_queue(struct sock *sk, unsigned int qlen,
-                                         int (*cb)(struct sk_buff *,
-                                                   struct nlmsghdr *));
+extern int             netlink_rcv_skb(struct sk_buff *skb,
+                                       int (*cb)(struct sk_buff *,
+                                                 struct nlmsghdr *));
 extern int             nlmsg_notify(struct sock *sk, struct sk_buff *skb,
                                     u32 pid, unsigned int group, int report,
                                     gfp_t flags);
@@ -862,7 +862,7 @@ static inline int nla_put_msecs(struct sk_buff *skb, int attrtype,
 
 #define NLA_PUT(skb, attrtype, attrlen, data) \
        do { \
-               if (nla_put(skb, attrtype, attrlen, data) < 0) \
+               if (unlikely(nla_put(skb, attrtype, attrlen, data) < 0)) \
                        goto nla_put_failure; \
        } while(0)