Commit 8f6374ff authored by Gary Wong's avatar Gary Wong

Implement proper support for P2PLTE interfaces and links.

parent 405527cf
......@@ -1892,7 +1892,7 @@ sub LoadVirtLans($)
$virtlan->_implemented_by($implemented_by);
$virtlan->_vpath(undef);
$virtlan->_bridged(0);
$virtlan->_wiretype("ethernet");
$virtlan->_wiretype( $protocol eq "P2PLTE" ? $protocol : "ethernet");
if ($vlanmember->ofenabled()) {
$virtlan->_ofenabled(1);
$virtlan->_ofcontroller($vlanmember->ofcontroller());
......
......@@ -1973,12 +1973,18 @@ while (($node1,$card1,$port1,$node2,$card2,$port2) =
}
# This comes from the switch info, unless its a direct link
# between two nodes; use ethernet in this case.
# between two nodes. Default to ethernet in the direct case unless
# there's an LTE interface.
my $basetype;
if (!defined($switchobj)) {
if( $interfacetypes{ "$node1:$card1:$port1" } eq "P2PLTE" ||
$interfacetypes{ "$node2:$card2:$port2" } eq "P2PLTE" ) {
$basetype = "P2PLTE";
} else {
$basetype = "ethernet";
}
}
elsif ($switchobj->NodeTypeAttribute("forwarding_protocols",
\$basetype) ||
!defined($basetype) || $basetype eq "") {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment