From bb62f1c28a584d73859f3d89ef44af26dca7813c Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Sun, 29 Jan 2012 15:50:44 +0000
Subject: [PATCH] --- yaml --- r: 289847 b: refs/heads/master c:
 6f7062457fc98e1fa22f74d8f386ed241213dec6 h: refs/heads/master i:   289845:
 fb8b7ccb8e74b6f65d0a66b9060ff8e8b454ee26   289843:
 2a39cfd9a2378335bbf4b05545c839c2f68a3f2d   289839:
 e72228226a2e75191e8241071d33e71001cc0352 v: v3

---
 [refs]                   | 2 +-
 trunk/net/core/netpoll.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index af8df42458d2..7cb6d26db707 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6ec26935aec629f03e76c67f3bbda68dd0155e2
+refs/heads/master: 6f7062457fc98e1fa22f74d8f386ed241213dec6
diff --git a/trunk/net/core/netpoll.c b/trunk/net/core/netpoll.c
index b5232743d5dc..4ce473ea5dc0 100644
--- a/trunk/net/core/netpoll.c
+++ b/trunk/net/core/netpoll.c
@@ -47,9 +47,11 @@ static atomic_t trapped;
 #define NETPOLL_RX_ENABLED  1
 #define NETPOLL_RX_DROP     2
 
-#define MAX_SKB_SIZE \
-		(MAX_UDP_CHUNK + sizeof(struct udphdr) + \
-				sizeof(struct iphdr) + sizeof(struct ethhdr))
+#define MAX_SKB_SIZE							\
+	(sizeof(struct ethhdr) +					\
+	 sizeof(struct iphdr) +						\
+	 sizeof(struct udphdr) +					\
+	 MAX_UDP_CHUNK)
 
 static void zap_completion_queue(void);
 static void arp_reply(struct sk_buff *skb);