net: replace %p6 with %pI6

[net-next-2.6.git] / net / xfrm / xfrm_state.c

diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 0a8f09c3144c835fccbc1e3de4855b654c45a3b9..304eca4ac9709e8ad117680ab2e40a116c80eac2 100644 (file)
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -408,11 +408,10 @@ static void xfrm_state_gc_task(struct work_struct *data)
        struct hlist_head gc_list;
 
        spin_lock_bh(&xfrm_state_gc_lock);
-       gc_list.first = xfrm_state_gc_list.first;
-       INIT_HLIST_HEAD(&xfrm_state_gc_list);
+       hlist_move_list(&xfrm_state_gc_list, &gc_list);
        spin_unlock_bh(&xfrm_state_gc_lock);
 
-       hlist_for_each_entry_safe(x, entry, tmp, &gc_list, bydst)
+       hlist_for_each_entry_safe(x, entry, tmp, &gc_list, gclist)
                xfrm_state_gc_destroy(x);
 
        wake_up(&km_waitq);
@@ -514,7 +513,7 @@ struct xfrm_state *xfrm_state_alloc(void)
        if (x) {
                atomic_set(&x->refcnt, 1);
                atomic_set(&x->tunnel_users, 0);
-               INIT_LIST_HEAD(&x->all);
+               INIT_LIST_HEAD(&x->km.all);
                INIT_HLIST_NODE(&x->bydst);
                INIT_HLIST_NODE(&x->bysrc);
                INIT_HLIST_NODE(&x->byspi);
@@ -540,12 +539,8 @@ void __xfrm_state_destroy(struct xfrm_state *x)
 {
        WARN_ON(x->km.state != XFRM_STATE_DEAD);
 
-       spin_lock_bh(&xfrm_state_lock);
-       list_del(&x->all);
-       spin_unlock_bh(&xfrm_state_lock);
-
        spin_lock_bh(&xfrm_state_gc_lock);
-       hlist_add_head(&x->bydst, &xfrm_state_gc_list);
+       hlist_add_head(&x->gclist, &xfrm_state_gc_list);
        spin_unlock_bh(&xfrm_state_gc_lock);
        schedule_work(&xfrm_state_gc_work);
 }
@@ -558,6 +553,7 @@ int __xfrm_state_delete(struct xfrm_state *x)
        if (x->km.state != XFRM_STATE_DEAD) {
                x->km.state = XFRM_STATE_DEAD;
                spin_lock(&xfrm_state_lock);
+               list_del(&x->km.all);
                hlist_del(&x->bydst);
                hlist_del(&x->bysrc);
                if (x->id.spi)
@@ -858,7 +854,7 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr,
 
                if (km_query(x, tmpl, pol) == 0) {
                        x->km.state = XFRM_STATE_ACQ;
-                       list_add_tail(&x->all, &xfrm_state_all);
+                       list_add(&x->km.all, &xfrm_state_all);
                        hlist_add_head(&x->bydst, xfrm_state_bydst+h);
                        h = xfrm_src_hash(daddr, saddr, family);
                        hlist_add_head(&x->bysrc, xfrm_state_bysrc+h);
@@ -927,7 +923,7 @@ static void __xfrm_state_insert(struct xfrm_state *x)
 
        x->genid = ++xfrm_state_genid;
 
-       list_add_tail(&x->all, &xfrm_state_all);
+       list_add(&x->km.all, &xfrm_state_all);
 
        h = xfrm_dst_hash(&x->id.daddr, &x->props.saddr,
                          x->props.reqid, x->props.family);
@@ -1056,7 +1052,7 @@ static struct xfrm_state *__find_acq_core(unsigned short family, u8 mode, u32 re
                xfrm_state_hold(x);
                x->timer.expires = jiffies + sysctl_xfrm_acq_expires*HZ;
                add_timer(&x->timer);
-               list_add_tail(&x->all, &xfrm_state_all);
+               list_add(&x->km.all, &xfrm_state_all);
                hlist_add_head(&x->bydst, xfrm_state_bydst+h);
                h = xfrm_src_hash(daddr, saddr, family);
                hlist_add_head(&x->bysrc, xfrm_state_bysrc+h);
@@ -1553,47 +1549,62 @@ int xfrm_state_walk(struct xfrm_state_walk *walk,
                    int (*func)(struct xfrm_state *, int, void*),
                    void *data)
 {
-       struct xfrm_state *old, *x, *last = NULL;
+       struct xfrm_state *state;
+       struct xfrm_state_walk *x;
        int err = 0;
 
-       if (walk->state == NULL && walk->count != 0)
+       if (walk->seq != 0 && list_empty(&walk->all))
                return 0;
 
-       old = x = walk->state;
-       walk->state = NULL;
        spin_lock_bh(&xfrm_state_lock);
-       if (x == NULL)
-               x = list_first_entry(&xfrm_state_all, struct xfrm_state, all);
+       if (list_empty(&walk->all))
+               x = list_first_entry(&xfrm_state_all, struct xfrm_state_walk, all);
+       else
+               x = list_entry(&walk->all, struct xfrm_state_walk, all);
        list_for_each_entry_from(x, &xfrm_state_all, all) {
-               if (x->km.state == XFRM_STATE_DEAD)
+               if (x->state == XFRM_STATE_DEAD)
                        continue;
-               if (!xfrm_id_proto_match(x->id.proto, walk->proto))
+               state = container_of(x, struct xfrm_state, km);
+               if (!xfrm_id_proto_match(state->id.proto, walk->proto))
                        continue;
-               if (last) {
-                       err = func(last, walk->count, data);
-                       if (err) {
-                               xfrm_state_hold(last);
-                               walk->state = last;
-                               goto out;
-                       }
+               err = func(state, walk->seq, data);
+               if (err) {
+                       list_move_tail(&walk->all, &x->all);
+                       goto out;
                }
-               last = x;
-               walk->count++;
+               walk->seq++;
        }
-       if (walk->count == 0) {
+       if (walk->seq == 0) {
                err = -ENOENT;
                goto out;
        }
-       if (last)
-               err = func(last, 0, data);
+       list_del_init(&walk->all);
 out:
        spin_unlock_bh(&xfrm_state_lock);
-       if (old != NULL)
-               xfrm_state_put(old);
        return err;
 }
 EXPORT_SYMBOL(xfrm_state_walk);
 
+void xfrm_state_walk_init(struct xfrm_state_walk *walk, u8 proto)
+{
+       INIT_LIST_HEAD(&walk->all);
+       walk->proto = proto;
+       walk->state = XFRM_STATE_DEAD;
+       walk->seq = 0;
+}
+EXPORT_SYMBOL(xfrm_state_walk_init);
+
+void xfrm_state_walk_done(struct xfrm_state_walk *walk)
+{
+       if (list_empty(&walk->all))
+               return;
+
+       spin_lock_bh(&xfrm_state_lock);
+       list_del(&walk->all);
+       spin_lock_bh(&xfrm_state_lock);
+}
+EXPORT_SYMBOL(xfrm_state_walk_done);
+
 
 void xfrm_replay_notify(struct xfrm_state *x, int event)
 {
@@ -1803,7 +1814,8 @@ EXPORT_SYMBOL(km_policy_expired);
 
 #ifdef CONFIG_XFRM_MIGRATE
 int km_migrate(struct xfrm_selector *sel, u8 dir, u8 type,
-              struct xfrm_migrate *m, int num_migrate)
+              struct xfrm_migrate *m, int num_migrate,
+              struct xfrm_kmaddress *k)
 {
        int err = -EINVAL;
        int ret;
@@ -1812,7 +1824,7 @@ int km_migrate(struct xfrm_selector *sel, u8 dir, u8 type,
        read_lock(&xfrm_km_lock);
        list_for_each_entry(km, &xfrm_km_list, list) {
                if (km->migrate) {
-                       ret = km->migrate(sel, dir, type, m, num_migrate);
+                       ret = km->migrate(sel, dir, type, m, num_migrate, k);
                        if (!ret)
                                err = ret;
                }
@@ -2103,10 +2115,8 @@ static void xfrm_audit_helper_sainfo(struct xfrm_state *x,
                                 NIPQUAD(x->id.daddr.a4));
                break;
        case AF_INET6:
-               audit_log_format(audit_buf,
-                                " src=" NIP6_FMT " dst=" NIP6_FMT,
-                                NIP6(*(struct in6_addr *)x->props.saddr.a6),
-                                NIP6(*(struct in6_addr *)x->id.daddr.a6));
+               audit_log_format(audit_buf, " src=%pI6 dst=%pI6",
+                                x->props.saddr.a6, x->id.daddr.a6);
                break;
        }
 
@@ -2130,10 +2140,8 @@ static void xfrm_audit_helper_pktinfo(struct sk_buff *skb, u16 family,
        case AF_INET6:
                iph6 = ipv6_hdr(skb);
                audit_log_format(audit_buf,
-                                " src=" NIP6_FMT " dst=" NIP6_FMT
-                                " flowlbl=0x%x%02x%02x",
-                                NIP6(iph6->saddr),
-                                NIP6(iph6->daddr),
+                                " src=%pI6 dst=%pI6 flowlbl=0x%x%02x%02x",
+                                &iph6->saddr,&iph6->daddr,
                                 iph6->flow_lbl[0] & 0x0f,
                                 iph6->flow_lbl[1],
                                 iph6->flow_lbl[2]);