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

Commit 8174aa8a authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller
Browse files

s390/qeth: consolidate qeth MAC address helpers 



For adding/removing a MAC address, use just one helper each that
handles both unicast and multicast.
Saves one level of indirection for multicast addresses, while improving
the error reporting for unicast addresses.

Signed-off-by: default avatarJulian Wiedmann <jwi@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4641b027

drivers/s390/net/qeth_l2_main.c

+18 −29
Original line number Original line Diff line number Diff line
@@ -156,48 +156,37 @@ static int qeth_l2_send_delmac(struct qeth_card *card, __u8 *mac) 
	return rc;

	return rc;

}

}





static int qeth_l2_send_setgroupmac(struct qeth_card *card, __u8 *mac)

static int qeth_l2_write_mac(struct qeth_card *card, u8 *mac)

{

{

	enum qeth_ipa_cmds cmd = is_multicast_ether_addr_64bits(mac) ?

					IPA_CMD_SETGMAC : IPA_CMD_SETVMAC;

	int rc;

	int rc;





	QETH_CARD_TEXT(card, 2, "L2Sgmac");

	QETH_CARD_TEXT(card, 2, "L2Wmac");

	rc = qeth_l2_send_setdelmac(card, mac, IPA_CMD_SETGMAC);

	rc = qeth_l2_send_setdelmac(card, mac, cmd);

	if (rc == -EEXIST)

	if (rc == -EEXIST)

		QETH_DBF_MESSAGE(2, "Group MAC %pM already existing on %s\n",

		QETH_DBF_MESSAGE(2, "MAC %pM already registered on %s\n",

				 mac, QETH_CARD_IFNAME(card));

				 mac, QETH_CARD_IFNAME(card));

	else if (rc)

	else if (rc)

		QETH_DBF_MESSAGE(2, "Could not set group MAC %pM on %s: %d\n",

		QETH_DBF_MESSAGE(2, "Failed to register MAC %pM on %s: %d\n",

				 mac, QETH_CARD_IFNAME(card), rc);

				 mac, QETH_CARD_IFNAME(card), rc);

	return rc;

	return rc;

}

}





static int qeth_l2_send_delgroupmac(struct qeth_card *card, __u8 *mac)

static int qeth_l2_remove_mac(struct qeth_card *card, u8 *mac)

{

{

	enum qeth_ipa_cmds cmd = is_multicast_ether_addr_64bits(mac) ?

					IPA_CMD_DELGMAC : IPA_CMD_DELVMAC;

	int rc;

	int rc;





	QETH_CARD_TEXT(card, 2, "L2Dgmac");

	QETH_CARD_TEXT(card, 2, "L2Rmac");

	rc = qeth_l2_send_setdelmac(card, mac, IPA_CMD_DELGMAC);

	rc = qeth_l2_send_setdelmac(card, mac, cmd);

	if (rc)

	if (rc)

		QETH_DBF_MESSAGE(2,

		QETH_DBF_MESSAGE(2, "Failed to delete MAC %pM on %s: %d\n",

			"Could not delete group MAC %pM on %s: %d\n",

				 mac, QETH_CARD_IFNAME(card), rc);

				 mac, QETH_CARD_IFNAME(card), rc);

	return rc;

	return rc;

}

}





static int qeth_l2_write_mac(struct qeth_card *card, struct qeth_mac *mac)

{

	if (is_multicast_ether_addr_64bits(mac->mac_addr))

		return qeth_l2_send_setgroupmac(card, mac->mac_addr);

	return qeth_l2_send_setdelmac(card, mac->mac_addr, IPA_CMD_SETVMAC);

}



static int qeth_l2_remove_mac(struct qeth_card *card, struct qeth_mac *mac)

{

	if (is_multicast_ether_addr_64bits(mac->mac_addr))

		return qeth_l2_send_delgroupmac(card, mac->mac_addr);

	return qeth_l2_send_setdelmac(card, mac->mac_addr, IPA_CMD_DELVMAC);

}



static void qeth_l2_del_all_macs(struct qeth_card *card)

static void qeth_l2_del_all_macs(struct qeth_card *card)

{

{

	struct qeth_mac *mac;

	struct qeth_mac *mac;
@@ -639,12 +628,12 @@ static void qeth_l2_set_rx_mode(struct net_device *dev) 




	hash_for_each_safe(card->mac_htable, i, tmp, mac, hnode) {

	hash_for_each_safe(card->mac_htable, i, tmp, mac, hnode) {

		if (mac->disp_flag == QETH_DISP_ADDR_DELETE) {

		if (mac->disp_flag == QETH_DISP_ADDR_DELETE) {

			qeth_l2_remove_mac(card, mac);

			qeth_l2_remove_mac(card, mac->mac_addr);

			hash_del(&mac->hnode);

			hash_del(&mac->hnode);

			kfree(mac);

			kfree(mac);





		} else if (mac->disp_flag == QETH_DISP_ADDR_ADD) {

		} else if (mac->disp_flag == QETH_DISP_ADDR_ADD) {

			rc = qeth_l2_write_mac(card, mac);

			rc = qeth_l2_write_mac(card, mac->mac_addr);

			if (rc) {

			if (rc) {

				hash_del(&mac->hnode);

				hash_del(&mac->hnode);

				kfree(mac);

				kfree(mac);