netdev - [PATCH net 1/3] pktgen: should not turn off vlan when we disable svlan

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1400147197-22445-1-git-send-email-liuhangbin@gmail.com>
Date:	Thu, 15 May 2014 17:46:35 +0800
From:	Hangbin Liu <liuhangbin@...il.com>
To:	David Miller <davem@...emloft.net>
Cc:	Francesco Fondelli <francesco.fondelli@...il.com>,
	netdev@...r.kernel.org, Hangbin Liu <liuhangbin@...il.com>
Subject: [PATCH net 1/3] pktgen: should not turn off vlan when we disable svlan

We will turn off svlan when disable vlan, but should keep vlan on when disable
svlan. Also fix the doc typo.

Signed-off-by: Hangbin Liu <liuhangbin@...il.com>
---
 Documentation/networking/pktgen.txt | 2 +-
 net/core/pktgen.c                   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Documentation/networking/pktgen.txt b/Documentation/networking/pktgen.txt
index 0e30c78..672fa23 100644
--- a/Documentation/networking/pktgen.txt
+++ b/Documentation/networking/pktgen.txt
@@ -150,7 +150,7 @@ Examples:
  pgset "svlan_cfi 0"      set canonical format identifier 0-1 (default 0)
 
  pgset "vlan_id 9999"     > 4095 remove vlan and svlan tags
- pgset "svlan 9999"       > 4095 remove svlan tag
+ pgset "svlan_id 9999"    > 4095 remove svlan tag
 
 
  pgset "tos XX"           set former IPv4 TOS field (e.g. "tos 28" for AF11 no ECN, default 00)
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 0304f98..dcf367f 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -1627,11 +1627,10 @@ static ssize_t pktgen_if_write(struct file *file,
 			pkt_dev->nr_labels = 0;    /* turn off MPLS */
 			sprintf(pg_result, "OK: svlan_id=%u", pkt_dev->svlan_id);
 		} else {
-			pkt_dev->vlan_id = 0xffff; /* turn off VLAN/SVLAN */
 			pkt_dev->svlan_id = 0xffff;
 
 			if (debug)
-				pr_debug("VLAN/SVLAN turned off\n");
+				pr_debug("SVLAN turned off\n");
 		}
 		return count;
 	}
-- 
1.8.1.4

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html