From 404ea3b3b653624e3b423fd4029934166e61faa7 Mon Sep 17 00:00:00 2001 From: Amerigo Wang Date: Tue, 9 Oct 2012 17:48:16 +0000 Subject: [PATCH] --- yaml --- r: 333999 b: refs/heads/master c: 5aa8b572007c4bca1e6d3dd4c4820f1ae49d6bb2 h: refs/heads/master i: 333997: a74f70a6f0251707a3cd309d883246aa32ed25e8 333995: d34958a9bdf6726ee3dead746847c8e36162f51b 333991: 2d91e85da7c1694b27fa0101bcad8cde804fee1c 333983: 53ea32d51cf64a2415bfd0541697e7aae0d3012f v: v3 --- [refs] | 2 +- trunk/net/core/pktgen.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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); }