summaryrefslogtreecommitdiff
path: root/docs/configuration
diff options
context:
space:
mode:
authorRobert Göhler <github@ghlr.de>2021-04-12 21:00:43 +0200
committerGitHub <noreply@github.com>2021-04-12 21:00:43 +0200
commit85a1523143321f5a03753d27873a412f20fcf3f0 (patch)
treef88f6be37f765a6c5d8a87b98546abc7786fe605 /docs/configuration
parentcb51e5ac54193aa490d7bed62f316252bb69404b (diff)
parentca605c69429fb74f9e05eff449f25ec7f4da4d12 (diff)
downloadvyos-documentation-85a1523143321f5a03753d27873a412f20fcf3f0.tar.gz
vyos-documentation-85a1523143321f5a03753d27873a412f20fcf3f0.zip
Merge pull request #508 from srividya0208/T3458-e
T3458-e:1.3 ver:tunnel interface:replaced GRETAP with GRE-Bridge
Diffstat (limited to 'docs/configuration')
-rw-r--r--docs/configuration/interfaces/tunnel.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/configuration/interfaces/tunnel.rst b/docs/configuration/interfaces/tunnel.rst
index 22648095..e7301549 100644
--- a/docs/configuration/interfaces/tunnel.rst
+++ b/docs/configuration/interfaces/tunnel.rst
@@ -201,12 +201,12 @@ An example:
set interfaces tunnel tun0 address 172.16.17.18/24
set interfaces tunnel tun0 parameters ip key 20
-GRETAP
-^^^^^^
+GRE-Bridge
+^^^^^^^^^^
-While normal GRE is for layer 3, GRETAP is for layer 2. GRETAP can encapsulate
-Ethernet frames, thus it can be bridged with other interfaces to create
-datalink layer segments that span multiple remote sites.
+While normal GRE is for layer 3, GRE-Bridge is for layer 2. GRE-Bridge can
+encapsulate Ethernet frames, thus it can be bridged with other interfaces to
+create datalink layer segments that span multiple remote sites.
Layer 2 GRE example:
@@ -214,7 +214,7 @@ Layer 2 GRE example:
set interfaces bridge br0 member interface eth0
set interfaces bridge br0 member interface tun0
- set interfaces tunnel tun0 encapsulation gretap
+ set interfaces tunnel tun0 encapsulation gre-bridge
set interfaces tunnel tun0 local-ip 198.51.100.2
set interfaces tunnel tun0 remote-ip 203.0.113.10