master/cdev.c
branchredundancy
changeset 2158 69f2b2702336
parent 2124 c4afc5fede19
child 2267 2d36f36a433c
equal deleted inserted replaced
2157:8fa0571f9996 2158:69f2b2702336
   211     data.devices[0].attached = master->main_device.dev ? 1 : 0;
   211     data.devices[0].attached = master->main_device.dev ? 1 : 0;
   212     data.devices[0].link_state = master->main_device.link_state ? 1 : 0;
   212     data.devices[0].link_state = master->main_device.link_state ? 1 : 0;
   213     data.devices[0].tx_count = master->main_device.tx_count;
   213     data.devices[0].tx_count = master->main_device.tx_count;
   214     data.devices[0].rx_count = master->main_device.rx_count;
   214     data.devices[0].rx_count = master->main_device.rx_count;
   215     data.devices[0].tx_bytes = master->main_device.tx_bytes;
   215     data.devices[0].tx_bytes = master->main_device.tx_bytes;
       
   216     data.devices[0].rx_bytes = master->main_device.rx_bytes;
   216     data.devices[0].tx_errors = master->main_device.tx_errors;
   217     data.devices[0].tx_errors = master->main_device.tx_errors;
   217     for (i = 0; i < EC_RATE_COUNT; i++) {
   218     for (i = 0; i < EC_RATE_COUNT; i++) {
   218         data.devices[0].tx_frame_rates[i] =
   219         data.devices[0].tx_frame_rates[i] =
   219             master->main_device.tx_frame_rates[i];
   220             master->main_device.tx_frame_rates[i];
       
   221         data.devices[0].rx_frame_rates[i] =
       
   222             master->main_device.rx_frame_rates[i];
   220         data.devices[0].tx_byte_rates[i] =
   223         data.devices[0].tx_byte_rates[i] =
   221             master->main_device.tx_byte_rates[i];
   224             master->main_device.tx_byte_rates[i];
   222         data.devices[0].loss_rates[i] = master->main_device.loss_rates[i];
   225         data.devices[0].rx_byte_rates[i] =
       
   226             master->main_device.rx_byte_rates[i];
   223     }
   227     }
   224 
   228 
   225     if (master->backup_device.dev) {
   229     if (master->backup_device.dev) {
   226         memcpy(data.devices[1].address,
   230         memcpy(data.devices[1].address,
   227                 master->backup_device.dev->dev_addr, ETH_ALEN); 
   231                 master->backup_device.dev->dev_addr, ETH_ALEN); 
   231     data.devices[1].attached = master->backup_device.dev ? 1 : 0;
   235     data.devices[1].attached = master->backup_device.dev ? 1 : 0;
   232     data.devices[1].link_state = master->backup_device.link_state ? 1 : 0;
   236     data.devices[1].link_state = master->backup_device.link_state ? 1 : 0;
   233     data.devices[1].tx_count = master->backup_device.tx_count;
   237     data.devices[1].tx_count = master->backup_device.tx_count;
   234     data.devices[1].rx_count = master->backup_device.rx_count;
   238     data.devices[1].rx_count = master->backup_device.rx_count;
   235     data.devices[1].tx_bytes = master->backup_device.tx_bytes;
   239     data.devices[1].tx_bytes = master->backup_device.tx_bytes;
       
   240     data.devices[1].rx_bytes = master->backup_device.rx_bytes;
   236     data.devices[1].tx_errors = master->backup_device.tx_errors;
   241     data.devices[1].tx_errors = master->backup_device.tx_errors;
   237     for (i = 0; i < EC_RATE_COUNT; i++) {
   242     for (i = 0; i < EC_RATE_COUNT; i++) {
   238         data.devices[1].tx_frame_rates[i] =
   243         data.devices[1].tx_frame_rates[i] =
   239             master->backup_device.tx_frame_rates[i];
   244             master->backup_device.tx_frame_rates[i];
       
   245         data.devices[1].rx_frame_rates[i] =
       
   246             master->backup_device.rx_frame_rates[i];
   240         data.devices[1].tx_byte_rates[i] =
   247         data.devices[1].tx_byte_rates[i] =
   241             master->backup_device.tx_byte_rates[i];
   248             master->backup_device.tx_byte_rates[i];
   242         data.devices[1].loss_rates[i] = master->backup_device.loss_rates[i];
   249         data.devices[1].rx_byte_rates[i] =
       
   250             master->backup_device.rx_byte_rates[i];
       
   251     }
       
   252 
       
   253     data.tx_count = master->device_stats.tx_count;
       
   254     data.rx_count = master->device_stats.rx_count;
       
   255     data.tx_bytes = master->device_stats.tx_bytes;
       
   256     data.rx_bytes = master->device_stats.rx_bytes;
       
   257     for (i = 0; i < EC_RATE_COUNT; i++) {
       
   258         data.tx_frame_rates[i] =
       
   259             master->device_stats.tx_frame_rates[i];
       
   260         data.rx_frame_rates[i] =
       
   261             master->device_stats.rx_frame_rates[i];
       
   262         data.tx_byte_rates[i] =
       
   263             master->device_stats.tx_byte_rates[i];
       
   264         data.rx_byte_rates[i] =
       
   265             master->device_stats.rx_byte_rates[i];
       
   266         data.loss_rates[i] =
       
   267             master->device_stats.loss_rates[i];
   243     }
   268     }
   244 
   269 
   245     up(&master->device_sem);
   270     up(&master->device_sem);
   246 
   271 
   247     data.app_time = master->app_time;
   272     data.app_time = master->app_time;