mt76: mt76u: add endpoint to mt76u_bulk_msg signature (3bcd979c) · Commits · 戴 / test

drivers/net/wireless/mediatek/mt76/mt76.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -866,7 +866,7 @@ static inline u8 q2ep(u8 qid)

		static inline int
		mt76u_bulk_msg(struct mt76_dev dev, void data, int len, int *actual_len,
		int timeout)
		int timeout, int ep)
		{
		struct usb_interface *uintf = to_usb_interface(dev->dev);
		struct usb_device *udev = interface_to_usbdev(uintf);
		@@ -874,9 +874,9 @@ mt76u_bulk_msg(struct mt76_dev dev, void data, int len, int *actual_len,
		unsigned int pipe;

		if (actual_len)
		pipe = usb_rcvbulkpipe(udev, usb->in_ep[MT_EP_IN_CMD_RESP]);
		pipe = usb_rcvbulkpipe(udev, usb->in_ep[ep]);
		else
		pipe = usb_sndbulkpipe(udev, usb->out_ep[MT_EP_OUT_INBAND_CMD]);
		pipe = usb_sndbulkpipe(udev, usb->out_ep[ep]);

		return usb_bulk_msg(udev, pipe, data, len, actual_len, timeout);
		}

+6 −3

Original line number	Diff line number	Diff line
		@@ -55,7 +55,8 @@ static int mt76x02u_mcu_wait_resp(struct mt76_dev *dev, u8 seq)
		u32 rxfce;

		for (i = 0; i < 5; i++) {
		ret = mt76u_bulk_msg(dev, data, MCU_RESP_URB_SIZE, &len, 300);
		ret = mt76u_bulk_msg(dev, data, MCU_RESP_URB_SIZE, &len,
		300, MT_EP_IN_CMD_RESP);
		if (ret == -ETIMEDOUT)
		continue;
		if (ret)
		@@ -103,7 +104,8 @@ __mt76x02u_mcu_send_msg(struct mt76_dev dev, struct sk_buff skb,
		if (ret)
		return ret;

		ret = mt76u_bulk_msg(dev, skb->data, skb->len, NULL, 500);
		ret = mt76u_bulk_msg(dev, skb->data, skb->len, NULL, 500,
		MT_EP_OUT_INBAND_CMD);
		if (ret)
		return ret;

		@@ -248,7 +250,8 @@ __mt76x02u_mcu_fw_send_data(struct mt76x02_dev dev, u8 data,

		data_len = MT_CMD_HDR_LEN + len + sizeof(info);

		err = mt76u_bulk_msg(&dev->mt76, data, data_len, NULL, 1000);
		err = mt76u_bulk_msg(&dev->mt76, data, data_len, NULL, 1000,
		MT_EP_OUT_INBAND_CMD);
		if (err) {
		dev_err(dev->mt76.dev, "firmware upload failed: %d\n", err);
		return err;