[3.19.y-ckt stable] Patch "pktgen: adjust flag NO_TIMESTAMP to be more pktgen compliant" has been added to staging queue
Kamal Mostafa
kamal at canonical.com
Thu Jul 16 01:07:27 UTC 2015
This is a note to let you know that I have just added a patch titled
pktgen: adjust flag NO_TIMESTAMP to be more pktgen compliant
to the linux-3.19.y-queue branch of the 3.19.y-ckt extended stable tree
which can be found at:
http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.19.y-queue
This patch is scheduled to be released in version 3.19.y-ckt4.
If you, or anyone else, feels it should not be added to this tree, please
reply to this email.
For more information about the 3.19.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable
Thanks.
-Kamal
------
>From 08aee17fd61aac07438ea0240fc0e8ad99226cac Mon Sep 17 00:00:00 2001
From: Jesper Dangaard Brouer <brouer at redhat.com>
Date: Thu, 7 May 2015 16:34:51 +0200
Subject: pktgen: adjust flag NO_TIMESTAMP to be more pktgen compliant
commit f1f00d8ff60ca056db3805406507483eeb3794d7 upstream.
Allow flag NO_TIMESTAMP to turn timestamping on again, like other flags,
with a negation of the flag like !NO_TIMESTAMP.
Also document the option flag NO_TIMESTAMP.
Fixes: afb84b626184 ("pktgen: add flag NO_TIMESTAMP to disable timestamping")
Signed-off-by: Jesper Dangaard Brouer <brouer at redhat.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
Documentation/networking/pktgen.txt | 2 ++
net/core/pktgen.c | 3 +++
2 files changed, 5 insertions(+)
diff --git a/Documentation/networking/pktgen.txt b/Documentation/networking/pktgen.txt
index 6915c6b..5c606cd 100644
--- a/Documentation/networking/pktgen.txt
+++ b/Documentation/networking/pktgen.txt
@@ -145,6 +145,7 @@ Examples:
UDPCSUM,
IPSEC # IPsec encapsulation (needs CONFIG_XFRM)
NODE_ALLOC # node specific memory allocation
+ NO_TIMESTAMP # disable timestamping
pgset spi SPI_VALUE Set specific SA used to transform packet.
@@ -285,6 +286,7 @@ flag
UDPCSUM
IPSEC
NODE_ALLOC
+ NO_TIMESTAMP
dst_min
dst_max
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 352d183..734e799 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -1267,6 +1267,9 @@ static ssize_t pktgen_if_write(struct file *file,
else if (strcmp(f, "NO_TIMESTAMP") == 0)
pkt_dev->flags |= F_NO_TIMESTAMP;
+ else if (strcmp(f, "!NO_TIMESTAMP") == 0)
+ pkt_dev->flags &= ~F_NO_TIMESTAMP;
+
else {
sprintf(pg_result,
"Flag -:%s:- unknown\nAvailable flags, (prepend ! to un-set flag):\n%s",
--
1.9.1
More information about the kernel-team
mailing list