---

yaml --- r: 41893 b: refs/heads/master c: 46ca5f5 h: refs/heads/master i: 41891: 81719a6 v: v3
git-mirror · Dec 3, 2006 · b3468ca · b3468ca
1 parent 0e07260
commit b3468ca
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5c42c0ec4f7fd5a4e19e33a2d561758b67c55c8
+refs/heads/master: 46ca5f5dc4f1c9b5ac02c0090ae8ff4ac8560446
diff --git a/trunk/include/net/xfrm.h b/trunk/include/net/xfrm.h
@@ -340,18 +340,19 @@ struct xfrm_policy
 	atomic_t		refcnt;
 	struct timer_list	timer;
 
-	u8			type;
 	u32			priority;
 	u32			index;
 	struct xfrm_selector	selector;
 	struct xfrm_lifetime_cfg lft;
 	struct xfrm_lifetime_cur curlft;
 	struct dst_entry       *bundles;
-	__u16			family;
-	__u8			action;
-	__u8			flags;
-	__u8			dead;
-	__u8			xfrm_nr;
+	u16			family;
+	u8			type;
+	u8			action;
+	u8			flags;
+	u8			dead;
+	u8			xfrm_nr;
+	/* XXX 1 byte hole, try to pack */
 	struct xfrm_sec_ctx	*security;
 	struct xfrm_tmpl       	xfrm_vec[XFRM_MAX_DEPTH];
 };