AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-05 01:16:43 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

ibmvnic: Fix calculation of number of TX header descriptors

Browse Source 
This patch correctly sets the number of additional header descriptors
that will be sent in an indirect SCRQ entry.

Signed-off-by: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Thomas Falcon 2017-10-16 10:02:11 -05:00 committed by David S. Miller
parent d965465b60
commit 2de09681e4
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/ethernet/ibm/ibmvnic.c
View File

@ -1093,11 +1093,12 @@ static int build_hdr_data(u8 hdr_field, struct sk_buff *skb,
* places them in a descriptor array, scrq_arr * places them in a descriptor array, scrq_arr
*/ */
static void create_hdr_descs(u8 hdr_field, u8 *hdr_data, int len, int *hdr_len, static int create_hdr_descs(u8 hdr_field, u8 *hdr_data, int len, int *hdr_len,
union sub_crq *scrq_arr) union sub_crq *scrq_arr)
{ {
union sub_crq hdr_desc; union sub_crq hdr_desc;
int tmp_len = len; int tmp_len = len;
int num_descs = 0;
u8 *data, *cur; u8 *data, *cur;
int tmp; int tmp;
@ -1126,7 +1127,10 @@ static void create_hdr_descs(u8 hdr_field, u8 *hdr_data, int len, int *hdr_len,
tmp_len -= tmp; tmp_len -= tmp;
*scrq_arr = hdr_desc; *scrq_arr = hdr_desc;
scrq_arr++; scrq_arr++;
num_descs++;
} }
return num_descs;
} }
/** /**
@ -1144,16 +1148,12 @@ static void build_hdr_descs_arr(struct ibmvnic_tx_buff *txbuff,
int *num_entries, u8 hdr_field) int *num_entries, u8 hdr_field)
{ {
int hdr_len[3] = {0, 0, 0}; int hdr_len[3] = {0, 0, 0};
int tot_len, len; int tot_len;
u8 *hdr_data = txbuff->hdr_data; u8 *hdr_data = txbuff->hdr_data;
tot_len = build_hdr_data(hdr_field, txbuff->skb, hdr_len, tot_len = build_hdr_data(hdr_field, txbuff->skb, hdr_len,
txbuff->hdr_data); txbuff->hdr_data);
len = tot_len; *num_entries += create_hdr_descs(hdr_field, hdr_data, tot_len, hdr_len,
len -= 24;
if (len > 0)
num_entries += len % 29 ? len / 29 + 1 : len / 29;
create_hdr_descs(hdr_field, hdr_data, tot_len, hdr_len,
txbuff->indir_arr + 1); txbuff->indir_arr + 1);
} }