1 files changed, 41 insertions, 50 deletions

diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 4bb94992b5fa..11c890ad8ebb 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -117,12 +117,21 @@ extern struct mutex xfrm_cfg_mutex;
       metrics. Plus, it will be made via sk->sk_dst_cache. Solved.
  */
 
+struct xfrm_state_walk {
+        struct list_head        all;
+        u8                      state;
+        union {
+                u8              dying;
+                u8              proto;
+        };
+        u32                     seq;
+};
+
 /* Full description of state of transformer. */
 struct xfrm_state
 {
-        struct list_head        all;
         union {
-                struct list_head        gclist;
+                struct hlist_node       gclist;
                 struct hlist_node       bydst;
         };
         struct hlist_node       bysrc;
@@ -136,12 +145,8 @@ struct xfrm_state
 
         u32                     genid;
 
-        /* Key manger bits */
-        struct {
-                u8              state;
-                u8              dying;
-                u32             seq;
-        } km;
+        /* Key manager bits */
+        struct xfrm_state_walk  km;
 
         /* Parameters of this state. */
         struct {
@@ -449,10 +454,20 @@ struct xfrm_tmpl
 
 #define XFRM_MAX_DEPTH          6
 
+struct xfrm_policy_walk_entry {
+        struct list_head        all;
+        u8                      dead;
+};
+
+struct xfrm_policy_walk {
+        struct xfrm_policy_walk_entry walk;
+        u8 type;
+        u32 seq;
+};
+
 struct xfrm_policy
 {
         struct xfrm_policy      *next;
-        struct list_head        bytype;
         struct hlist_node       bydst;
         struct hlist_node       byidx;
 
@@ -467,17 +482,23 @@ struct xfrm_policy
         struct xfrm_lifetime_cfg lft;
         struct xfrm_lifetime_cur curlft;
         struct dst_entry       *bundles;
-        u16                     family;
+        struct xfrm_policy_walk_entry walk;
         u8                      type;
         u8                      action;
         u8                      flags;
-        u8                      dead;
         u8                      xfrm_nr;
-        /* XXX 1 byte hole, try to pack */
+        u16                     family;
         struct xfrm_sec_ctx     *security;
         struct xfrm_tmpl        xfrm_vec[XFRM_MAX_DEPTH];
 };
 
+struct xfrm_kmaddress {
+        xfrm_address_t          local;
+        xfrm_address_t          remote;
+        u32                     reserved;
+        u16                     family;
+};
+
 struct xfrm_migrate {
         xfrm_address_t          old_daddr;
         xfrm_address_t          old_saddr;
@@ -517,7 +538,7 @@ struct xfrm_mgr
         int                     (*new_mapping)(struct xfrm_state *x, xfrm_address_t *ipaddr, __be16 sport);
         int                     (*notify_policy)(struct xfrm_policy *x, int dir, struct km_event *c);
         int                     (*report)(u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr);
-        int                     (*migrate)(struct xfrm_selector *sel, u8 dir, u8 type, struct xfrm_migrate *m, int num_bundles);
+        int                     (*migrate)(struct xfrm_selector *sel, u8 dir, u8 type, struct xfrm_migrate *m, int num_bundles, struct xfrm_kmaddress *k);
 };
 
 extern int xfrm_register_km(struct xfrm_mgr *km);
@@ -1245,18 +1266,6 @@ struct xfrm6_tunnel {
         int priority;
 };
 
-struct xfrm_state_walk {
-        struct xfrm_state *state;
-        int count;
-        u8 proto;
-};
-
-struct xfrm_policy_walk {
-        struct xfrm_policy *policy;
-        int count;
-        u8 type, cur_type;
-};
-
 extern void xfrm_init(void);
 extern void xfrm4_init(void);
 extern void xfrm_state_init(void);
@@ -1281,13 +1290,7 @@ static inline void xfrm6_fini(void)
 extern int xfrm_proc_init(void);
 #endif
 
-static inline void xfrm_state_walk_init(struct xfrm_state_walk *walk, u8 proto)
-{
-        walk->proto = proto;
-        walk->state = NULL;
-        walk->count = 0;
-}
-
+extern void xfrm_state_walk_init(struct xfrm_state_walk *walk, u8 proto);
 extern int xfrm_state_walk(struct xfrm_state_walk *walk,
                            int (*func)(struct xfrm_state *, int, void*), void *);
 extern void xfrm_state_walk_done(struct xfrm_state_walk *walk);
@@ -1414,24 +1417,10 @@ static inline int xfrm4_udp_encap_rcv(struct sock *sk, struct sk_buff *skb)
 
 struct xfrm_policy *xfrm_policy_alloc(gfp_t gfp);
 
-static inline void xfrm_policy_walk_init(struct xfrm_policy_walk *walk, u8 type)
-{
-        walk->cur_type = XFRM_POLICY_TYPE_MAIN;
-        walk->type = type;
-        walk->policy = NULL;
-        walk->count = 0;
-}
-
-static inline void xfrm_policy_walk_done(struct xfrm_policy_walk *walk)
-{
-        if (walk->policy != NULL) {
-                xfrm_pol_put(walk->policy);
-                walk->policy = NULL;
-        }
-}
-
+extern void xfrm_policy_walk_init(struct xfrm_policy_walk *walk, u8 type);
 extern int xfrm_policy_walk(struct xfrm_policy_walk *walk,
         int (*func)(struct xfrm_policy *, int, int, void*), void *);
+extern void xfrm_policy_walk_done(struct xfrm_policy_walk *walk);
 int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl);
 struct xfrm_policy *xfrm_policy_bysel_ctx(u8 type, int dir,
                                           struct xfrm_selector *sel,
@@ -1450,12 +1439,14 @@ extern int xfrm_bundle_ok(struct xfrm_policy *pol, struct xfrm_dst *xdst,
 
 #ifdef CONFIG_XFRM_MIGRATE
 extern int km_migrate(struct xfrm_selector *sel, u8 dir, u8 type,
-                      struct xfrm_migrate *m, int num_bundles);
+                      struct xfrm_migrate *m, int num_bundles,
+                      struct xfrm_kmaddress *k);
 extern struct xfrm_state * xfrm_migrate_state_find(struct xfrm_migrate *m);
 extern struct xfrm_state * xfrm_state_migrate(struct xfrm_state *x,
                                               struct xfrm_migrate *m);
 extern int xfrm_migrate(struct xfrm_selector *sel, u8 dir, u8 type,
-                        struct xfrm_migrate *m, int num_bundles);
+                        struct xfrm_migrate *m, int num_bundles,
+                        struct xfrm_kmaddress *k);
 #endif
 
 extern wait_queue_head_t km_waitq;