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

Commit e1ff91c5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: gadget: f_gsi: Increase num of buffers to 50 for ECM and RmNet"

parents 74b19d63 441f2325

drivers/usb/gadget/function/f_gsi.c

+4 −4
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2019, Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2020, Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -3125,7 +3125,7 @@ static int gsi_bind(struct usb_configuration *c, struct usb_function *f) 
		info.out_epname = "gsi-epout";

		info.in_req_buf_len = GSI_IN_BUFF_SIZE;

		gsi->d_port.in_aggr_size = GSI_IN_RNDIS_AGGR_SIZE;

		info.in_req_num_buf = GSI_NUM_IN_RNDIS_BUFFERS;

		info.in_req_num_buf = GSI_NUM_IN_RNDIS_RMNET_ECM_BUFFERS;

		gsi->d_port.out_aggr_size = GSI_OUT_AGGR_SIZE;

		info.out_req_buf_len = GSI_OUT_AGGR_SIZE;

		info.out_req_num_buf = GSI_NUM_OUT_BUFFERS;
@@ -3316,7 +3316,7 @@ static int gsi_bind(struct usb_configuration *c, struct usb_function *f) 
		info.out_epname = "gsi-epout";

		gsi->d_port.in_aggr_size = GSI_IN_RMNET_AGGR_SIZE;

		info.in_req_buf_len = GSI_IN_BUFF_SIZE;

		info.in_req_num_buf = GSI_NUM_IN_BUFFERS;

		info.in_req_num_buf = GSI_NUM_IN_RNDIS_RMNET_ECM_BUFFERS;

		gsi->d_port.out_aggr_size = GSI_OUT_AGGR_SIZE;

		info.out_req_buf_len = GSI_OUT_RMNET_BUF_LEN;

		info.out_req_num_buf = GSI_NUM_OUT_BUFFERS;
@@ -3349,7 +3349,7 @@ static int gsi_bind(struct usb_configuration *c, struct usb_function *f) 
		info.out_epname = "gsi-epout";

		gsi->d_port.in_aggr_size = GSI_ECM_AGGR_SIZE;

		info.in_req_buf_len = GSI_IN_BUFF_SIZE;

		info.in_req_num_buf = GSI_NUM_IN_BUFFERS;

		info.in_req_num_buf = GSI_NUM_IN_RNDIS_RMNET_ECM_BUFFERS;

		gsi->d_port.out_aggr_size = GSI_ECM_AGGR_SIZE;

		info.out_req_buf_len = GSI_OUT_ECM_BUF_LEN;

		info.out_req_num_buf = GSI_NUM_OUT_BUFFERS;

drivers/usb/gadget/function/f_gsi.h

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -43,7 +43,7 @@ 
#define GSI_MAX_CTRL_PKT_SIZE 8192

#define GSI_CTRL_DTR (1 << 0)



#define GSI_NUM_IN_RNDIS_BUFFERS 50

#define GSI_NUM_IN_RNDIS_RMNET_ECM_BUFFERS 50

#define GSI_NUM_IN_BUFFERS 15

#define GSI_IN_BUFF_SIZE 2048

#define GSI_NUM_OUT_BUFFERS 14