Skip to content

Commit 083bd27

Browse files
committed
Fix optical port description to align to standard
See tx_pwr_min, tx_pwr_max type /* Optical port description property. */ struct ofp_port_desc_prop_optical { uint16_t type; /* OFPPDPT_3OPTICAL. */ uint16_t length; /* Length in bytes of this property. */ uint8_t pad[4]; /* Align to 64 bits. */ uint32_t supported; /* Features supported by the port. */ uint32_t tx_min_freq_lmda; /* Minimum TX Frequency/Wavelength */ uint32_t tx_max_freq_lmda; /* Maximum TX Frequency/Wavelength */ uint32_t tx_grid_freq_lmda; /* TX Grid Spacing Frequency/Wavelength */ uint32_t rx_min_freq_lmda; /* Minimum RX Frequency/Wavelength */ uint32_t rx_max_freq_lmda; /* Maximum RX Frequency/Wavelength */ uint32_t rx_grid_freq_lmda; /* RX Grid Spacing Frequency/Wavelength */ uint16_t tx_pwr_min; /* Minimum TX power */ uint16_t tx_pwr_max; /* Maximum TX power */ }; OFP_ASSERT(sizeof(struct ofp_port_desc_prop_optical) == 40);
1 parent 70334a1 commit 083bd27

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

openflow_input/standard-1.4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -872,8 +872,8 @@ struct of_port_desc_prop_optical : of_port_desc_prop {
872872
uint32_t rx_min_freq_lmda;
873873
uint32_t rx_max_freq_lmda;
874874
uint32_t rx_grid_freq_lmda;
875-
uint32_t tx_pwr_min;
876-
uint32_t tx_pwr_max;
875+
uint16_t tx_pwr_min;
876+
uint16_t tx_pwr_max;
877877
};
878878

879879
struct of_port_desc_prop_experimenter : of_port_desc_prop {

openflow_input/standard-1.5

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,8 @@ struct of_port_desc_prop_optical : of_port_desc_prop {
239239
uint32_t rx_min_freq_lmda;
240240
uint32_t rx_max_freq_lmda;
241241
uint32_t rx_grid_freq_lmda;
242-
uint32_t tx_pwr_min;
243-
uint32_t tx_pwr_max;
242+
uint16_t tx_pwr_min;
243+
uint16_t tx_pwr_max;
244244
};
245245

246246
/* Ingress pipeline fields description property */

0 commit comments

Comments
 (0)