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

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c between commit
f3e3ccf83bab ("qlcnic: Fix resource allocation for TX queues") from the
net tree and commit 154d0c810c53 ("qlcnic: VLAN enhancement for 84XX
adapters") from the net-next tree.

I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
index 024f8161d2fe,98b621fb1227..000000000000
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
@@@ -75,17 -76,22 +76,22 @@@ static int qlcnic_sriov_pf_cal_res_limi
  	num_vfs = sriov->num_vfs;
  	max = num_vfs + 1;
  	info->bit_offsets = 0xffff;
- 	info->max_rx_mcast_mac_filters = res->num_rx_mcast_mac_filters;
- 	num_vf_macs = QLCNIC_SRIOV_VF_MAX_MAC;
 -	info->max_tx_ques = res->num_tx_queues / max;
+ 
+ 	if (qlcnic_83xx_pf_check(adapter))
+ 		num_macs = 1;
  
  	if (adapter->ahw->pci_func == func) {
- 		temp = res->num_rx_mcast_mac_filters - (num_vfs * num_vf_macs);
- 		info->max_rx_ucast_mac_filters = temp;
- 		temp = res->num_tx_mac_filters - (num_vfs * num_vf_macs);
- 		info->max_tx_mac_filters = temp;
  		info->min_tx_bw = 0;
  		info->max_tx_bw = MAX_BW;
 +		info->max_tx_ques = res->num_tx_queues - sriov->num_vfs;
+ 		temp = res->num_rx_ucast_mac_filters - num_macs * num_vfs;
+ 		info->max_rx_ucast_mac_filters = temp;
+ 		temp = res->num_tx_mac_filters - num_macs * num_vfs;
+ 		info->max_tx_mac_filters = temp;
+ 		temp = num_macs * num_vfs * QLCNIC_SRIOV_VF_MAX_MAC;
+ 		temp = res->num_rx_mcast_mac_filters - temp;
+ 		info->max_rx_mcast_mac_filters = temp;
+ 
  	} else {
  		id = qlcnic_sriov_func_to_index(adapter, func);
  		if (id < 0)
@@@ -93,9 -99,10 +99,11 @@@
  		vp = sriov->vf_info[id].vp;
  		info->min_tx_bw = vp->min_tx_bw;
  		info->max_tx_bw = vp->max_tx_bw;
- 		info->max_rx_ucast_mac_filters = num_vf_macs;
- 		info->max_tx_mac_filters = num_vf_macs;
+ 		info->max_rx_ucast_mac_filters = num_macs;
+ 		info->max_tx_mac_filters = num_macs;
 +		info->max_tx_ques = QLCNIC_SINGLE_RING;
+ 		temp = num_macs * QLCNIC_SRIOV_VF_MAX_MAC;
+ 		info->max_rx_mcast_mac_filters = temp;
  	}
  
  	info->max_rx_ip_addr = res->num_destip / max;

Attachment: pgp0eFC56Kseh.pgp
Description: PGP signature