Commit e8d6336d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'thunderbolt-for-v5.16-rc1' of... 

Merge tag 'thunderbolt-for-v5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-next

Mika writes:

thunderbolt: Changes for v5.16 merge window

This includes following Thunderbolt/USB4 changes for the v5.16 merge
window:

  * Re-enable retry logic for control packets in domain needed by some
    controllers when software connection manager is being used
  * Fix -Wrestrict build warning emitted by gcc-11.

Both have been in linux-next with no reported issues.

* tag 'thunderbolt-for-v5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt:
  thunderbolt: Fix -Wrestrict warning
  thunderbolt: Enable retry logic for intra-domain control packets
parents 9e894ee3 0a0624a2

drivers/thunderbolt/ctl.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 




#define TB_CTL_RX_PKG_COUNT	10

#define TB_CTL_RETRIES		1

#define TB_CTL_RETRIES		4



/**

 * struct tb_ctl - Thunderbolt control channel

drivers/thunderbolt/xdomain.c

+1 −1
Original line number Diff line number Diff line
@@ -730,7 +730,7 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, 


	/* Full buffer size except new line and null termination */

	get_modalias(svc, buf, PAGE_SIZE - 2);

	return sprintf(buf, "%s\n", buf);

	return strlen(strcat(buf, "\n"));

}

static DEVICE_ATTR_RO(modalias);