---

yaml --- r: 351323 b: refs/heads/master c: ba96bcb h: refs/heads/master i: 351321: c30ed7c 351319: 7058108 v: v3
git-mirror · Jan 10, 2013 · f0388e3 · f0388e3
1 parent 96755d0
commit f0388e3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95c7e0e4d4792f9c9629ad759c9be047a3ddbcc5
+refs/heads/master: ba96bcbcd213e66306e8669e3442b0b3689dd768
diff --git a/trunk/net/ipv6/af_inet6.c b/trunk/net/ipv6/af_inet6.c
@@ -811,11 +811,10 @@ static struct pernet_operations inet6_net_ops = {
 
 static int __init inet6_init(void)
 {
-	struct sk_buff *dummy_skb;
 	struct list_head *r;
 	int err = 0;
 
-	BUILD_BUG_ON(sizeof(struct inet6_skb_parm) > sizeof(dummy_skb->cb));
+	BUILD_BUG_ON(sizeof(struct inet6_skb_parm) > FIELD_SIZEOF(struct sk_buff, cb));
 
 	/* Register the socket-side information for inet6_create.  */
 	for (r = &inetsw6[0]; r < &inetsw6[SOCK_MAX]; ++r)