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

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

Merge "usb: f_gsi: Honor RNDIS host IN aggregation size"

parents 97fe84a8 d97a7b30

drivers/usb/gadget/function/f_gsi.c

+5 −6
Original line number Diff line number Diff line
@@ -1655,11 +1655,10 @@ static void gsi_rndis_command_complete(struct usb_ep *ep, 


	buf = (rndis_init_msg_type *)req->buf;

	if (buf->MessageType == RNDIS_MSG_INIT) {

		gsi->d_port.in_aggr_size = min_t(u32, gsi->d_port.in_aggr_size,

		/* honor host dl aggr size */

		gsi->d_port.in_aggr_size = gsi->params->dl_max_xfer_size;

		log_event_dbg("RNDIS host dl_aggr_size:%d\n",

				gsi->params->dl_max_xfer_size);

		log_event_dbg("RNDIS host dl_aggr_size:%d in_aggr_size:%d\n",

				gsi->params->dl_max_xfer_size,

				gsi->d_port.in_aggr_size);

	}

}
@@ -2565,7 +2564,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_BUFFERS;

		info.in_req_num_buf = GSI_NUM_IN_RNDIS_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;

drivers/usb/gadget/function/f_gsi.h

+2 −2
Original line number Diff line number Diff line
@@ -34,13 +34,13 @@ 
#define GSI_MAX_CTRL_PKT_SIZE 4096

#define GSI_CTRL_DTR (1 << 0)





#define GSI_NUM_IN_RNDIS_BUFFERS 50

#define GSI_NUM_IN_BUFFERS 15

#define GSI_IN_BUFF_SIZE 2048

#define GSI_NUM_OUT_BUFFERS 14

#define GSI_OUT_AGGR_SIZE 24576



#define GSI_IN_RNDIS_AGGR_SIZE 9216

#define GSI_IN_RNDIS_AGGR_SIZE 16384

#define GSI_IN_MBIM_AGGR_SIZE 16384

#define GSI_IN_RMNET_AGGR_SIZE 16384

#define GSI_ECM_AGGR_SIZE 2048