From df5cafbe600c6a06ca02f201ccebd48855f1d012 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?YOSHIFUJI=20Hideaki=20/=20=E5=90=89=E8=97=A4=E8=8B=B1?=
 =?UTF-8?q?=E6=98=8E?= <yoshfuji@linux-ipv6.org>
Date: Wed, 9 Jan 2013 07:20:07 +0000
Subject: [PATCH] --- yaml --- r: 351327 b: refs/heads/master c:
 b4fff5f8bf32766ecaa4af6d5c7ef7f0ffb88ed2 h: refs/heads/master i:   351325:
 ff5fb531b4235f78e23b1383ab728a415619a7f1   351323:
 f0388e3984ba7c62a3be02a3f00c6e8f1e251ab0   351319:
 70581088d0c152f918c354feb8c5fb08164c47a7   351311:
 83426dee851a45e5d51ac8831a0b4592bf1bbacc   351295:
 71a52cb469f9b924cc9d687ee5ece33ae22a8a1e v: v3

---
 [refs]                   | 2 +-
 trunk/net/unix/af_unix.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6710cf3c9d90..b645d28c15bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce6654cfc12558cc65b198cca991684e58e10bc6
+refs/heads/master: b4fff5f8bf32766ecaa4af6d5c7ef7f0ffb88ed2
diff --git a/trunk/net/unix/af_unix.c b/trunk/net/unix/af_unix.c
index 5b5c876c80e9..0c612361c153 100644
--- a/trunk/net/unix/af_unix.c
+++ b/trunk/net/unix/af_unix.c
@@ -2426,9 +2426,8 @@ static struct pernet_operations unix_net_ops = {
 static int __init af_unix_init(void)
 {
 	int rc = -1;
-	struct sk_buff *dummy_skb;
 
-	BUILD_BUG_ON(sizeof(struct unix_skb_parms) > sizeof(dummy_skb->cb));
+	BUILD_BUG_ON(sizeof(struct unix_skb_parms) > FIELD_SIZEOF(struct sk_buff, cb));
 
 	rc = proto_register(&unix_proto, 1);
 	if (rc != 0) {