From ba76299388e4802c63173fd91163bddd7cd0b0ba Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Fri, 8 Oct 2004 09:10:07 +0000
Subject: fix encapsulation for chinese ISPs (Funda Wang, #10965)

---
 perl-install/network/adsl_consts.pm | 42 +++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

(limited to 'perl-install/network')

diff --git a/perl-install/network/adsl_consts.pm b/perl-install/network/adsl_consts.pm
index 3968c7e2e..5c79409e3 100644
--- a/perl-install/network/adsl_consts.pm
+++ b/perl-install/network/adsl_consts.pm
@@ -4,6 +4,8 @@ package network::adsl_consts; # $Id$
 
 use vars qw(@ISA @EXPORT);
 use common;
+use utf8;
+use encoding "utf8";
 
 @ISA = qw(Exporter);
 @EXPORT = qw(@adsl_data);
@@ -143,7 +145,7 @@ our %adsl_data = (
                   {
                    vpi => 0,
                    vci => 23,
-                   Encapsulation => 1,
+                   Encapsulation => 3,
                    method => 'pppoe',
                   },
 
@@ -151,7 +153,7 @@ our %adsl_data = (
                   {
                    vpi => 8,
                    vci => 23,
-                   Encapsulation => 1,
+                   Encapsulation => 3,
                    method => 'pppoe',
                   },
 
@@ -159,7 +161,7 @@ our %adsl_data = (
                   {
                    vpi => 8,
                    vci => 23,
-                   Encapsulation => 1,
+                   Encapsulation => 3,
                    method => 'pppoe',
                   },
 
@@ -167,7 +169,7 @@ our %adsl_data = (
                   {
                    vpi => 0,
                    vci => 27,
-                   Encapsulation => 1,
+                   Encapsulation => 3,
                    method => 'pppoe',
                   },
 
@@ -175,7 +177,7 @@ our %adsl_data = (
                   {
                    vpi => 0,
                    vci => 20,
-                   Encapsulation => 1,
+                   Encapsulation => 3,
                    method => 'pppoe',
                   },
 
@@ -183,7 +185,7 @@ our %adsl_data = (
                   {
                    vpi => 0,
                    vci => 23,
-                   Encapsulation => 1,
+                   Encapsulation => 3,
                    method => 'pppoe',
                   },
 
@@ -191,7 +193,7 @@ our %adsl_data = (
                   {
                    vpi => 8,
                    vci => 23,
-                   Encapsulation => 1,
+                   Encapsulation => 3,
                    method => 'pppoe',
                   },
 
@@ -199,7 +201,7 @@ our %adsl_data = (
                   {
                    vpi => 0,
                    vci => 23,
-                   Encapsulation => 1,
+                   Encapsulation => 3,
                    method => 'pppoe',
                   },
 
@@ -207,7 +209,7 @@ our %adsl_data = (
                   {
                    vpi => 0,
                    vci => 0xc8,
-                   Encapsulation => 1,
+                   Encapsulation => 3,
                    method => 'pppoe',
                   },
 
@@ -215,7 +217,7 @@ our %adsl_data = (
                   {
                    vpi => 0,
                    vci => 23,
-                   Encapsulation => 1,
+                   Encapsulation => 3,
                    method => 'pppoe',
                   },
 
@@ -223,7 +225,7 @@ our %adsl_data = (
                   {
                    vpi => 8,
                    vci => 20,
-                   Encapsulation => 1,
+                   Encapsulation => 3,
                    method => 'pppoe',
                   },
 
@@ -231,7 +233,7 @@ our %adsl_data = (
                   {
                    vpi => 0,
                    vci => 20,
-                   Encapsulation => 1,
+                   Encapsulation => 3,
                    method => 'pppoe',
                   },
 
@@ -239,7 +241,7 @@ our %adsl_data = (
                   {
                    vpi => 0,
                    vci => 23,
-                   Encapsulation => 1,
+                   Encapsulation => 3,
                    method => 'pppoe',
                   },
 
@@ -247,7 +249,7 @@ our %adsl_data = (
                   {
                    vpi => 8,
                    vci => 23,
-                   Encapsulation => 1,
+                   Encapsulation => 3,
                    method => 'pppoe',
                   },
 
@@ -255,7 +257,7 @@ our %adsl_data = (
                   {
                    vpi => 8,
                    vci => 51,
-                   Encapsulation => 1,
+                   Encapsulation => 3,
                    method => 'pppoe',
                   },
 
@@ -263,7 +265,7 @@ our %adsl_data = (
                   {
                    vpi => 8,
                    vci => 23,
-                   Encapsulation => 1,
+                   Encapsulation => 3,
                    method => 'pppoe',
                   },
 
@@ -271,7 +273,7 @@ our %adsl_data = (
                   {
                    vpi => 0,
                    vci => 20,
-                   Encapsulation => 1,
+                   Encapsulation => 3,
                    method => 'pppoe',
                   },
 
@@ -279,7 +281,7 @@ our %adsl_data = (
                   {
                    vpi => 0,
                    vci => 20,
-                   Encapsulation => 1,
+                   Encapsulation => 3,
                    method => 'pppoe',
                   },
 
@@ -287,7 +289,7 @@ our %adsl_data = (
                   {
                    vpi => 0,
                    vci => 23,
-                   Encapsulation => 1,
+                   Encapsulation => 3,
                    method => 'pppoe',
                   },
 
@@ -295,7 +297,7 @@ our %adsl_data = (
                   {
                    vpi => 0,
                    vci => 23,
-                   Encapsulation => 1,
+                   Encapsulation => 3,
                    method => 'pppoe',
                   },
 
-- 
cgit v1.2.1