This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / net / xfrm / xfrm_user.c

diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 502c30d..db2087c 100644 (file)
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -332,7 +332,6 @@ struct xfrm_dump_info {
        struct sk_buff *in_skb;
        struct sk_buff *out_skb;
        u32 nlmsg_seq;
-       u16 nlmsg_flags;
        int start_idx;
        int this_idx;
 };
@@ -352,7 +351,7 @@ static int dump_one_state(struct xfrm_state *x, int count, void *ptr)
        nlh = NLMSG_PUT(skb, NETLINK_CB(in_skb).pid,
                        sp->nlmsg_seq,
                        XFRM_MSG_NEWSA, sizeof(*p));
-       nlh->nlmsg_flags = sp->nlmsg_flags;
+       nlh->nlmsg_flags = 0;
 
        p = NLMSG_DATA(nlh);
        copy_to_user_state(x, p);
@@ -387,7 +386,6 @@ static int xfrm_dump_sa(struct sk_buff *skb, struct netlink_callback *cb)
        info.in_skb = cb->skb;
        info.out_skb = skb;
        info.nlmsg_seq = cb->nlh->nlmsg_seq;
-       info.nlmsg_flags = NLM_F_MULTI;
        info.this_idx = 0;
        info.start_idx = cb->args[0];
        (void) xfrm_state_walk(IPSEC_PROTO_ANY, dump_one_state, &info);
@@ -410,7 +408,6 @@ static struct sk_buff *xfrm_state_netlink(struct sk_buff *in_skb,
        info.in_skb = in_skb;
        info.out_skb = skb;
        info.nlmsg_seq = seq;
-       info.nlmsg_flags = 0;
        info.this_idx = info.start_idx = 0;
 
        if (dump_one_state(x, 0, &info)) {
@@ -746,7 +743,7 @@ static int dump_one_policy(struct xfrm_policy *xp, int dir, int count, void *ptr
                        sp->nlmsg_seq,
                        XFRM_MSG_NEWPOLICY, sizeof(*p));
        p = NLMSG_DATA(nlh);
-       nlh->nlmsg_flags = sp->nlmsg_flags;
+       nlh->nlmsg_flags = 0;
 
        copy_to_user_policy(xp, p, dir);
        if (copy_to_user_tmpl(xp, skb) < 0)
@@ -769,7 +766,6 @@ static int xfrm_dump_policy(struct sk_buff *skb, struct netlink_callback *cb)
        info.in_skb = cb->skb;
        info.out_skb = skb;
        info.nlmsg_seq = cb->nlh->nlmsg_seq;
-       info.nlmsg_flags = NLM_F_MULTI;
        info.this_idx = 0;
        info.start_idx = cb->args[0];
        (void) xfrm_policy_walk(dump_one_policy, &info);
@@ -793,7 +789,6 @@ static struct sk_buff *xfrm_policy_netlink(struct sk_buff *in_skb,
        info.in_skb = in_skb;
        info.out_skb = skb;
        info.nlmsg_seq = seq;
-       info.nlmsg_flags = 0;
        info.this_idx = info.start_idx = 0;
 
        if (dump_one_policy(xp, dir, 0, &info) < 0) {
@@ -1237,7 +1232,8 @@ static int __init xfrm_user_init(void)
 
        xfrm_nl = netlink_kernel_create(NETLINK_XFRM, xfrm_netlink_rcv);
        if (xfrm_nl == NULL)
-               return -ENOMEM;
+               panic("xfrm_user_init: cannot initialize xfrm_nl\n");
+
 
        xfrm_register_km(&netlink_mgr);