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

Commit d998ab0b authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by David S. Miller
Browse files

drivers/s390/net/qeth_l2_main.c: use %pM to shown MAC address 



Use the %pM kernel extension to display the MAC address.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5491f3a5

drivers/s390/net/qeth_l2_main.c

+6 −18
Original line number Diff line number Diff line
@@ -486,22 +486,14 @@ static int qeth_l2_send_setmac_cb(struct qeth_card *card, 
		case IPA_RC_L2_DUP_MAC:

		case IPA_RC_L2_DUP_LAYER3_MAC:

			dev_warn(&card->gdev->dev,

				"MAC address "

				"%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x "

				"already exists\n",

				card->dev->dev_addr[0], card->dev->dev_addr[1],

				card->dev->dev_addr[2], card->dev->dev_addr[3],

				card->dev->dev_addr[4], card->dev->dev_addr[5]);

				"MAC address %pM already exists\n",

				card->dev->dev_addr);

			break;

		case IPA_RC_L2_MAC_NOT_AUTH_BY_HYP:

		case IPA_RC_L2_MAC_NOT_AUTH_BY_ADP:

			dev_warn(&card->gdev->dev,

				"MAC address "

				"%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x "

				"is not authorized\n",

				card->dev->dev_addr[0], card->dev->dev_addr[1],

				card->dev->dev_addr[2], card->dev->dev_addr[3],

				card->dev->dev_addr[4], card->dev->dev_addr[5]);

				"MAC address %pM is not authorized\n",

				card->dev->dev_addr);

			break;

		default:

			break;
@@ -512,12 +504,8 @@ static int qeth_l2_send_setmac_cb(struct qeth_card *card, 
		memcpy(card->dev->dev_addr, cmd->data.setdelmac.mac,

		       OSA_ADDR_LEN);

		dev_info(&card->gdev->dev,

			"MAC address %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x "

			"successfully registered on device %s\n",

			card->dev->dev_addr[0], card->dev->dev_addr[1],

			card->dev->dev_addr[2], card->dev->dev_addr[3],

			card->dev->dev_addr[4], card->dev->dev_addr[5],

			card->dev->name);

			"MAC address %pM successfully registered on device %s\n",

			card->dev->dev_addr, card->dev->name);

	}

	return 0;

}