Revert "[DHCP relay]: Add patch to always undef VLAN_TCI_PRESENT so a…

…s not to treat VLAN-tagged packets differently (#1254)" (#1291) This reverts commit 64602ad. Reverting this commit because the root cause of the issue was due to a Broadcom SDK bug which caused VLAN-tagged packets to be tagged twice. When packets were double-tagged, only one tag was getting stripped before the packet was trapped to the CPU. However, the second tag was left behind, which would cause the DHCP relay agent to ignore the packet. The bug has since been fixed, so now all VLAN-tagged packets should properly have their tag removed before being trapped to the CPU. Therefore the DHCP relay agent should never encounter a VLAN-tagged packet.
sonic-net · Jan 10, 2018 · 50f060e · 50f060e
1 parent 6d39e3a
commit 50f060e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 40 deletions.
diff --git a/src/isc-dhcp/patch/0001-Always-undef-VLAN_TCI_PRESENT-so-as-not-to-treat-VLA.patch b/src/isc-dhcp/patch/0001-Always-undef-VLAN_TCI_PRESENT-so-as-not-to-treat-VLA.patch
diff --git a/...on-82-circuit-ID-and-remote-ID-fiel.patch → ...on-82-circuit-ID-and-remote-ID-fiel.patch b/...on-82-circuit-ID-and-remote-ID-fiel.patch → ...on-82-circuit-ID-and-remote-ID-fiel.patch
@@ -1,7 +1,7 @@
-From c2361e2bf24408cc21a4691c3897cc64c95372f1 Mon Sep 17 00:00:00 2001
+From 284c87ff4b3873d0215904273fe3c86b07b4ba94 Mon Sep 17 00:00:00 2001
 From: Joe LeVeque <jolevequ@microsoft.com>
 Date: Mon, 11 Dec 2017 23:21:08 +0000
-Subject: [PATCH 2/4] Customizable Option 82 circuit ID and remote ID fields
+Subject: [PATCH 1/3] Customizable Option 82 circuit ID and remote ID fields
 
 ---
  relay/dhcrelay.c | 182 ++++++++++++++++++++++++++++++++++++++++++++++---------

diff --git a/...ning-name-of-physical-interface-tha.patch → ...ning-name-of-physical-interface-tha.patch b/...ning-name-of-physical-interface-tha.patch → ...ning-name-of-physical-interface-tha.patch
@@ -1,7 +1,7 @@
-From 236d4f1cb0afa2bee22f47a48b725427bfcb5a9c Mon Sep 17 00:00:00 2001
+From caad3e05c31c9fad8cda378ce95a1969def771a2 Mon Sep 17 00:00:00 2001
 From: Joe LeVeque <jolevequ@microsoft.com>
 Date: Mon, 11 Dec 2017 23:39:10 +0000
-Subject: [PATCH 3/4] Support for obtaining name of physical interface that is
+Subject: [PATCH 2/3] Support for obtaining name of physical interface that is
  a member of a bridge interface
 
 ---

diff --git a/...ng-port-alias-map-file-to-replace-p.patch → ...ng-port-alias-map-file-to-replace-p.patch b/...ng-port-alias-map-file-to-replace-p.patch → ...ng-port-alias-map-file-to-replace-p.patch
@@ -1,7 +1,7 @@
-From 1092578a8415b9d49182c2b9825753e96481246a Mon Sep 17 00:00:00 2001
+From 3a42b497716375c9347b51c3a28c5e91e7cd4cf4 Mon Sep 17 00:00:00 2001
 From: Joe LeVeque <jolevequ@microsoft.com>
 Date: Tue, 12 Dec 2017 00:49:09 +0000
-Subject: [PATCH 4/4] Support for loading port alias map file to replace port
+Subject: [PATCH 3/3] Support for loading port alias map file to replace port
  name with alias in circuit id
 
 ---

diff --git a/src/isc-dhcp/patch/series b/src/isc-dhcp/patch/series
@@ -1,5 +1,4 @@
 # This series applies on GIT commit ee3dffdda38a8cfc6ad2005d8d64a165d2a709ba
-0001-Always-undef-VLAN_TCI_PRESENT-so-as-not-to-treat-VLA.patch
-0002-Customizable-Option-82-circuit-ID-and-remote-ID-fiel.patch
-0003-Support-for-obtaining-name-of-physical-interface-tha.patch
-0004-Support-for-loading-port-alias-map-file-to-replace-p.patch
+0001-Customizable-Option-82-circuit-ID-and-remote-ID-fiel.patch
+0002-Support-for-obtaining-name-of-physical-interface-tha.patch
+0003-Support-for-loading-port-alias-map-file-to-replace-p.patch