---

yaml --- r: 121715 b: refs/heads/master c: d5f6423 h: refs/heads/master i: 121713: 4ac666a 121711: 07ed418 v: v3
git-mirror · Nov 4, 2008 · 20bf4c5 · 20bf4c5
1 parent 4238969
commit 20bf4c5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2ad3ca88da02baeccd5216780f1fe983c6953ba
+refs/heads/master: d5f642384e9da75393160350f75bbb9a527f7c58
diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h
@@ -271,7 +271,9 @@ struct sock {
 	struct sk_buff		*sk_send_head;
 	__u32			sk_sndmsg_off;
 	int			sk_write_pending;
+#ifdef CONFIG_SECURITY
 	void			*sk_security;
+#endif
 	__u32			sk_mark;
 	/* XXX 4 bytes hole on 64 bit */
 	void			(*sk_state_change)(struct sock *sk);