Commit e807fa3f authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 's390-qeth-fixes' 



Julian Wiedmann says:

====================
s390/qeth: fixes 2020-06-17

please apply the following patch series for qeth to netdev's net tree.

The first patch fixes a regression in the error handling for a specific
cmd type. I have some follow-ups queued up for net-next to clean this
up properly...

The second patch fine-tunes the HW offload restrictions that went in
with this merge window. In some setups we don't need to apply them.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f3c7a6e0 8cebedb6

drivers/s390/net/qeth_core_main.c

+5 −6
Original line number Diff line number Diff line
@@ -4544,9 +4544,6 @@ static int qeth_setadpparms_set_access_ctrl_cb(struct qeth_card *card, 
	int fallback = *(int *)reply->param;



	QETH_CARD_TEXT(card, 4, "setaccb");

	if (cmd->hdr.return_code)

		return -EIO;

	qeth_setadpparms_inspect_rc(cmd);



	access_ctrl_req = &cmd->data.setadapterparms.data.set_access_ctrl;

	QETH_CARD_TEXT_(card, 2, "rc=%d",
@@ -4556,7 +4553,7 @@ static int qeth_setadpparms_set_access_ctrl_cb(struct qeth_card *card, 
		QETH_DBF_MESSAGE(3, "ERR:SET_ACCESS_CTRL(%#x) on device %x: %#x\n",

				 access_ctrl_req->subcmd_code, CARD_DEVID(card),

				 cmd->data.setadapterparms.hdr.return_code);

	switch (cmd->data.setadapterparms.hdr.return_code) {

	switch (qeth_setadpparms_inspect_rc(cmd)) {

	case SET_ACCESS_CTRL_RC_SUCCESS:

		if (card->options.isolation == ISOLATION_MODE_NONE) {

			dev_info(&card->gdev->dev,
@@ -6840,9 +6837,11 @@ netdev_features_t qeth_features_check(struct sk_buff *skb, 
				      struct net_device *dev,

				      netdev_features_t features)

{

	/* Traffic with local next-hop is not eligible for some offloads: */

	if (skb->ip_summed == CHECKSUM_PARTIAL) {

	struct qeth_card *card = dev->ml_priv;



	/* Traffic with local next-hop is not eligible for some offloads: */

	if (skb->ip_summed == CHECKSUM_PARTIAL &&

	    card->options.isolation != ISOLATION_MODE_FWD) {

		netdev_features_t restricted = 0;



		if (skb_is_gso(skb) && !netif_needs_gso(skb, features))

CRA Git | Maintained and supported by SUSTech CRA and CCSE