From: Thomas Falcon <tlfal...@linux.vnet.ibm.com> Date: Thu, 15 Mar 2018 11:02:37 -0500
> Remove some unused fields in the structure and include values > describing the individual buffer size and number of buffers in > a TX pool. This allows us to use these fields for TX pool buffer > accounting as opposed to using hard coded values. Finally, split > TSO buffers out and provide an additional TX pool array for TSO. > > Signed-off-by: Thomas Falcon <tlfal...@linux.vnet.ibm.com> ... > diff --git a/drivers/net/ethernet/ibm/ibmvnic.h > b/drivers/net/ethernet/ibm/ibmvnic.h > index 099c89d..a2e21b3 100644 > --- a/drivers/net/ethernet/ibm/ibmvnic.h > +++ b/drivers/net/ethernet/ibm/ibmvnic.h > @@ -917,11 +917,9 @@ struct ibmvnic_tx_pool { > int *free_map; > int consumer_index; > int producer_index; > - wait_queue_head_t ibmvnic_tx_comp_q; > - struct task_struct *work_thread; > struct ibmvnic_long_term_buff long_term_buff; > - struct ibmvnic_long_term_buff tso_ltb; > - int tso_index; > + int num_buffers; > + int buf_size; > }; > > struct ibmvnic_rx_buff { Thomas, members like tso_ltb are used in the code at this point. You can't remove it here like this, because it makes your patch series non-bisectable. The tree should compile cleanly and work properly at each stage of your series. Thank you.