Subject: linux-next: manual merge of the net-next tree with the net tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 16 Feb 2012 12:38:03 +1100

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c between commit
66d885cba670 ("bnx2x: fix bnx2x_storm_stats_update() on big endian") from
the net tree and commit 1355b704b9ba ("bnx2x: consistent statistics after
internal driver reload") from the net-next tree.

I fixed it up (see below) but suspect that there may be more needed.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
index 1adef26,abd310d..0000000
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
@@@ -1006,97 -980,43 +980,43 @@@ static int bnx2x_storm_stats_update(str
  				    total_transmitted_dropped_packets_error);
  
  		/* TPA aggregations completed */
- 		UPDATE_EXTEND_USTAT(coalesced_events, total_tpa_aggregations);
+ 		UPDATE_EXTEND_E_USTAT(coalesced_events, total_tpa_aggregations);
  		/* Number of network frames aggregated by TPA */
- 		UPDATE_EXTEND_USTAT(coalesced_pkts,
- 				    total_tpa_aggregated_frames);
+ 		UPDATE_EXTEND_E_USTAT(coalesced_pkts,
+ 				      total_tpa_aggregated_frames);
  		/* Total number of bytes in completed TPA aggregations */
- 		qstats->total_tpa_bytes_lo =
- 			le32_to_cpu(uclient->coalesced_bytes.lo);
- 		qstats->total_tpa_bytes_hi =
- 			le32_to_cpu(uclient->coalesced_bytes.hi);
- 
- 		/* TPA stats per-function */
- 		ADD_64(estats->total_tpa_aggregations_hi,
- 		       qstats->total_tpa_aggregations_hi,
- 		       estats->total_tpa_aggregations_lo,
- 		       qstats->total_tpa_aggregations_lo);
- 		ADD_64(estats->total_tpa_aggregated_frames_hi,
- 		       qstats->total_tpa_aggregated_frames_hi,
- 		       estats->total_tpa_aggregated_frames_lo,
- 		       qstats->total_tpa_aggregated_frames_lo);
- 		ADD_64(estats->total_tpa_bytes_hi,
- 		       qstats->total_tpa_bytes_hi,
- 		       estats->total_tpa_bytes_lo,
- 		       qstats->total_tpa_bytes_lo);
- 
- 		ADD_64(fstats->total_bytes_received_hi,
- 		       qstats->total_bytes_received_hi,
- 		       fstats->total_bytes_received_lo,
- 		       qstats->total_bytes_received_lo);
- 		ADD_64(fstats->total_bytes_transmitted_hi,
- 		       qstats->total_bytes_transmitted_hi,
- 		       fstats->total_bytes_transmitted_lo,
- 		       qstats->total_bytes_transmitted_lo);
- 		ADD_64(fstats->total_unicast_packets_received_hi,
- 		       qstats->total_unicast_packets_received_hi,
- 		       fstats->total_unicast_packets_received_lo,
- 		       qstats->total_unicast_packets_received_lo);
- 		ADD_64(fstats->total_multicast_packets_received_hi,
- 		       qstats->total_multicast_packets_received_hi,
- 		       fstats->total_multicast_packets_received_lo,
- 		       qstats->total_multicast_packets_received_lo);
- 		ADD_64(fstats->total_broadcast_packets_received_hi,
- 		       qstats->total_broadcast_packets_received_hi,
- 		       fstats->total_broadcast_packets_received_lo,
- 		       qstats->total_broadcast_packets_received_lo);
- 		ADD_64(fstats->total_unicast_packets_transmitted_hi,
- 		       qstats->total_unicast_packets_transmitted_hi,
- 		       fstats->total_unicast_packets_transmitted_lo,
- 		       qstats->total_unicast_packets_transmitted_lo);
- 		ADD_64(fstats->total_multicast_packets_transmitted_hi,
- 		       qstats->total_multicast_packets_transmitted_hi,
- 		       fstats->total_multicast_packets_transmitted_lo,
- 		       qstats->total_multicast_packets_transmitted_lo);
- 		ADD_64(fstats->total_broadcast_packets_transmitted_hi,
- 		       qstats->total_broadcast_packets_transmitted_hi,
- 		       fstats->total_broadcast_packets_transmitted_lo,
- 		       qstats->total_broadcast_packets_transmitted_lo);
- 		ADD_64(fstats->valid_bytes_received_hi,
- 		       qstats->valid_bytes_received_hi,
- 		       fstats->valid_bytes_received_lo,
- 		       qstats->valid_bytes_received_lo);
- 
- 		ADD_64(estats->etherstatsoverrsizepkts_hi,
- 		       qstats->etherstatsoverrsizepkts_hi,
- 		       estats->etherstatsoverrsizepkts_lo,
- 		       qstats->etherstatsoverrsizepkts_lo);
- 		ADD_64(estats->no_buff_discard_hi, qstats->no_buff_discard_hi,
- 		       estats->no_buff_discard_lo, qstats->no_buff_discard_lo);
+ 		UPDATE_QSTAT(uclient->coalesced_bytes, total_tpa_bytes);
+ 
+ 		UPDATE_ESTAT_QSTAT_64(total_tpa_bytes);
+ 
+ 		UPDATE_FSTAT_QSTAT(total_bytes_received);
+ 		UPDATE_FSTAT_QSTAT(total_bytes_transmitted);
+ 		UPDATE_FSTAT_QSTAT(total_unicast_packets_received);
+ 		UPDATE_FSTAT_QSTAT(total_multicast_packets_received);
+ 		UPDATE_FSTAT_QSTAT(total_broadcast_packets_received);
+ 		UPDATE_FSTAT_QSTAT(total_unicast_packets_transmitted);
+ 		UPDATE_FSTAT_QSTAT(total_multicast_packets_transmitted);
+ 		UPDATE_FSTAT_QSTAT(total_broadcast_packets_transmitted);
+ 		UPDATE_FSTAT_QSTAT(valid_bytes_received);
  	}
  
- 	ADD_64(fstats->total_bytes_received_hi,
+ 	ADD_64(estats->total_bytes_received_hi,
  	       estats->rx_stat_ifhcinbadoctets_hi,
- 	       fstats->total_bytes_received_lo,
+ 	       estats->total_bytes_received_lo,
  	       estats->rx_stat_ifhcinbadoctets_lo);
  
- 	ADD_64(fstats->total_bytes_received_hi,
+ 	ADD_64(estats->total_bytes_received_hi,
 -	       tfunc->rcv_error_bytes.hi,
 +	       le32_to_cpu(tfunc->rcv_error_bytes.hi),
- 	       fstats->total_bytes_received_lo,
+ 	       estats->total_bytes_received_lo,
 -	       tfunc->rcv_error_bytes.lo);
 +	       le32_to_cpu(tfunc->rcv_error_bytes.lo));
  
- 	memcpy(estats, &(fstats->total_bytes_received_hi),
- 	       sizeof(struct host_func_stats) - 2*sizeof(u32));
- 
  	ADD_64(estats->error_bytes_received_hi,
 -	       tfunc->rcv_error_bytes.hi,
 +	       le32_to_cpu(tfunc->rcv_error_bytes.hi),
  	       estats->error_bytes_received_lo,
 -	       tfunc->rcv_error_bytes.lo);
 +	       le32_to_cpu(tfunc->rcv_error_bytes.lo));
  
- 	ADD_64(estats->etherstatsoverrsizepkts_hi,
- 	       estats->rx_stat_dot3statsframestoolong_hi,
- 	       estats->etherstatsoverrsizepkts_lo,
- 	       estats->rx_stat_dot3statsframestoolong_lo);
+ 	UPDATE_ESTAT(etherstatsoverrsizepkts, rx_stat_dot3statsframestoolong);
+ 
  	ADD_64(estats->error_bytes_received_hi,
  	       estats->rx_stat_ifhcinbadoctets_hi,
  	       estats->error_bytes_received_lo,