From 1fbe660423bda139581eef562772c232de8bac5a Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Sun, 18 Nov 2007 18:48:08 -0800
Subject: [PATCH] --- yaml --- r: 74189 b: refs/heads/master c:
 21df56c6e2372e09c916111efb6c14c372a5ab2e h: refs/heads/master i:   74187:
 1366860b8bbca815416f32ba49ee90aeb3ee9e6d v: v3

---
 [refs]                   | 2 +-
 trunk/include/net/sock.h | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2031eeb736d9..fb634bfde894 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 483b23ffa3a5f44767038b0a676d757e0668437e
+refs/heads/master: 21df56c6e2372e09c916111efb6c14c372a5ab2e
diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h
index 567e468d7492..67e35c7e230c 100644
--- a/trunk/include/net/sock.h
+++ b/trunk/include/net/sock.h
@@ -1236,6 +1236,9 @@ static inline struct sk_buff *sk_stream_alloc_pskb(struct sock *sk,
 {
 	struct sk_buff *skb;
 
+	/* The TCP header must be at least 32-bit aligned.  */
+	size = ALIGN(size, 4);
+
 	skb = alloc_skb_fclone(size + sk->sk_prot->max_header, gfp);
 	if (skb) {
 		skb->truesize += mem;