diff --git a/[refs] b/[refs]
index 0a53a7ade403..93f15325a37a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85457685e0e314f6902caaef976b3fd8ef4f51b4
+refs/heads/master: 5aa8b572007c4bca1e6d3dd4c4820f1ae49d6bb2
diff --git a/trunk/net/core/pktgen.c b/trunk/net/core/pktgen.c
index 148e73d2c451..e356b8d52bad 100644
--- a/trunk/net/core/pktgen.c
+++ b/trunk/net/core/pktgen.c
@@ -2927,7 +2927,7 @@ static struct sk_buff *fill_packet_ipv6(struct net_device *odev,
 		  sizeof(struct ipv6hdr) - sizeof(struct udphdr) -
 		  pkt_dev->pkt_overhead;
 
-	if (datalen < sizeof(struct pktgen_hdr)) {
+	if (datalen < 0 || datalen < sizeof(struct pktgen_hdr)) {
 		datalen = sizeof(struct pktgen_hdr);
 		net_info_ratelimited("increased datalen to %d\n", datalen);
 	}