Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "[DHCP relay]: Add patch to always undef VLAN_TCI_PRESENT so as not to treat VLAN-tagged packets differently (#1254)" #1291

Merged
merged 1 commit into from
Jan 10, 2018
Merged

Revert "[DHCP relay]: Add patch to always undef VLAN_TCI_PRESENT so as not to treat VLAN-tagged packets differently (#1254)" #1291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 0 additions & 30 deletions src/isc-dhcp/patch/0001-Always-undef-VLAN_TCI_PRESENT-so-as-not-to-treat-VLA.patch
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...on-82-circuit-ID-and-remote-ID-fiel.patch → ...on-82-circuit-ID-and-remote-ID-fiel.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 ++++++++++++++++++++++++++++++++++++++++++++++---------
Expand Down
4 changes: 2 additions & 2 deletions ...ning-name-of-physical-interface-tha.patch → ...ning-name-of-physical-interface-tha.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

---
Expand Down
4 changes: 2 additions & 2 deletions ...ng-port-alias-map-file-to-replace-p.patch → ...ng-port-alias-map-file-to-replace-p.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

---
Expand Down
7 changes: 3 additions & 4 deletions src/isc-dhcp/patch/series
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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