Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2de09681 authored by Thomas Falcon's avatar Thomas Falcon Committed by David S. Miller
Browse files

ibmvnic: Fix calculation of number of TX header descriptors 



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

Signed-off-by: default avatarThomas Falcon <tlfalcon@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d965465b

drivers/net/ethernet/ibm/ibmvnic.c

+8 −8
Original line number Diff line number Diff line
@@ -1093,11 +1093,12 @@ static int build_hdr_data(u8 hdr_field, struct sk_buff *skb, 
 * 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 hdr_desc;

	int tmp_len = len;

	int num_descs = 0;

	u8 *data, *cur;

	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;

		*scrq_arr = hdr_desc;

		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 hdr_len[3] = {0, 0, 0};

	int tot_len, len;

	int tot_len;

	u8 *hdr_data = txbuff->hdr_data;



	tot_len = build_hdr_data(hdr_field, txbuff->skb, hdr_len,

				 txbuff->hdr_data);

	len = tot_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,

	*num_entries += create_hdr_descs(hdr_field, hdr_data, tot_len, hdr_len,

			 txbuff->indir_arr + 1);

}