Compare commits
	
		
			2 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					5af11cb612 | ||
| 
						 | 
					aa17e6865c | 
@@ -63,6 +63,8 @@ sub agg_ports_ifstack {
 | 
				
			|||||||
  foreach my $idx ( keys %$ifStack ) {
 | 
					  foreach my $idx ( keys %$ifStack ) {
 | 
				
			||||||
      my ( $higher, $lower ) = split /\./, $idx;
 | 
					      my ( $higher, $lower ) = split /\./, $idx;
 | 
				
			||||||
      next if ( $higher == 0 or $lower == 0 );
 | 
					      next if ( $higher == 0 or $lower == 0 );
 | 
				
			||||||
 | 
					      next unless exists $ifType->{ $higher } and defined $ifType->{ $higher };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      if ( $ifType->{ $higher } eq 'ieee8023adLag'
 | 
					      if ( $ifType->{ $higher } eq 'ieee8023adLag'
 | 
				
			||||||
            or $ifType->{ $higher } eq 'propMultiplexor' ) {
 | 
					            or $ifType->{ $higher } eq 'propMultiplexor' ) {
 | 
				
			||||||
          $ret->{ $lower } = $higher;
 | 
					          $ret->{ $lower } = $higher;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -153,6 +153,8 @@ sub agg_ports_propvirtual {
 | 
				
			|||||||
  foreach my $idx ( keys %$ifStack ) {
 | 
					  foreach my $idx ( keys %$ifStack ) {
 | 
				
			||||||
      my ( $higher, $lower ) = split /\./, $idx;
 | 
					      my ( $higher, $lower ) = split /\./, $idx;
 | 
				
			||||||
      next if ( $higher == 0 or $lower == 0 );
 | 
					      next if ( $higher == 0 or $lower == 0 );
 | 
				
			||||||
 | 
					      next unless exists $ifType->{ $higher } and defined $ifType->{ $higher };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      if ( $ifType->{ $higher } eq 'propVirtual' ) {
 | 
					      if ( $ifType->{ $higher } eq 'propVirtual' ) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
          # lower needs also to be configured in pagpEthcOperationMode
 | 
					          # lower needs also to be configured in pagpEthcOperationMode
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -873,8 +873,12 @@ sub agg_ports {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  my $ret = {};
 | 
					  my $ret = {};
 | 
				
			||||||
  foreach my $m (keys %$trunks) {
 | 
					  foreach my $m (keys %$trunks) {
 | 
				
			||||||
 | 
					      next unless $m and exists $ports->{$m} and defined $ports->{$m};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      my $skip = 0;
 | 
					      my $skip = 0;
 | 
				
			||||||
      while (my $s = unpack("x${skip}n2", $trunks->{$m})) {
 | 
					      while (my $s = unpack("x${skip}n2", $trunks->{$m})) {
 | 
				
			||||||
 | 
					          next unless $s and exists $ports->{$s} and defined $ports->{$s};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
          $ret->{ $ports->{$s} } = $ports->{$m};
 | 
					          $ret->{ $ports->{$s} } = $ports->{$m};
 | 
				
			||||||
          $skip += 2;
 | 
					          $skip += 2;
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user