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

Commit 99f0b85d authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller
Browse files

s390/qeth: use ether_addr_* helpers 



Be a little more self-documenting, and get rid of OSA_ADDR_LEN.

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

drivers/s390/net/qeth_core_main.c

+5 −6
Original line number Diff line number Diff line
@@ -4216,9 +4216,8 @@ static int qeth_setadpparms_change_macaddr_cb(struct qeth_card *card, 
	cmd = (struct qeth_ipa_cmd *) data;

	if (!card->options.layer2 ||

	    !(card->info.mac_bits & QETH_LAYER2_MAC_READ)) {

		memcpy(card->dev->dev_addr,

		       &cmd->data.setadapterparms.data.change_addr.addr,

		       OSA_ADDR_LEN);

		ether_addr_copy(card->dev->dev_addr,

				cmd->data.setadapterparms.data.change_addr.addr);

		card->info.mac_bits |= QETH_LAYER2_MAC_READ;

	}

	qeth_default_setadapterparms_cb(card, reply, (unsigned long) cmd);
@@ -4240,9 +4239,9 @@ int qeth_setadpparms_change_macaddr(struct qeth_card *card) 
		return -ENOMEM;

	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);

	cmd->data.setadapterparms.data.change_addr.cmd = CHANGE_ADDR_READ_MAC;

	cmd->data.setadapterparms.data.change_addr.addr_size = OSA_ADDR_LEN;

	memcpy(&cmd->data.setadapterparms.data.change_addr.addr,

	       card->dev->dev_addr, OSA_ADDR_LEN);

	cmd->data.setadapterparms.data.change_addr.addr_size = ETH_ALEN;

	ether_addr_copy(cmd->data.setadapterparms.data.change_addr.addr,

			card->dev->dev_addr);

	rc = qeth_send_ipa_cmd(card, iob, qeth_setadpparms_change_macaddr_cb,

			       NULL);

	return rc;

drivers/s390/net/qeth_core_mpc.h

+6 −7
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#define __QETH_CORE_MPC_H__



#include <asm/qeth.h>

#include <uapi/linux/if_ether.h>



#define IPA_PDU_HEADER_SIZE	0x40

#define QETH_IPA_PDU_LEN_TOTAL(buffer) (buffer + 0x0e)
@@ -25,7 +26,6 @@ extern unsigned char IPA_PDU_HEADER[]; 
#define QETH_SEQ_NO_LENGTH	4

#define QETH_MPC_TOKEN_LENGTH	4

#define QETH_MCL_LENGTH		4

#define OSA_ADDR_LEN		6



#define QETH_TIMEOUT		(10 * HZ)

#define QETH_IPA_TIMEOUT	(45 * HZ)
@@ -416,12 +416,11 @@ struct qeth_query_cmds_supp { 
} __attribute__ ((packed));



struct qeth_change_addr {

	__u32 cmd;

	__u32 addr_size;

	__u32 no_macs;

	__u8 addr[OSA_ADDR_LEN];

} __attribute__ ((packed));



	u32 cmd;

	u32 addr_size;

	u32 no_macs;

	u8 addr[ETH_ALEN];

};



struct qeth_snmp_cmd {

	__u8  token[16];

drivers/s390/net/qeth_l2.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ int qeth_l2_vnicc_get_timeout(struct qeth_card *card, u32 *timeout); 
bool qeth_l2_vnicc_is_in_use(struct qeth_card *card);



struct qeth_mac {

	u8 mac_addr[OSA_ADDR_LEN];

	u8 mac_addr[ETH_ALEN];

	u8 disp_flag:2;

	struct hlist_node hnode;

};

drivers/s390/net/qeth_l2_main.c

+6 −6
Original line number Diff line number Diff line
@@ -109,8 +109,8 @@ static int qeth_l2_send_setdelmac(struct qeth_card *card, __u8 *mac, 
	if (!iob)

		return -ENOMEM;

	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);

	cmd->data.setdelmac.mac_length = OSA_ADDR_LEN;

	memcpy(&cmd->data.setdelmac.mac, mac, OSA_ADDR_LEN);

	cmd->data.setdelmac.mac_length = ETH_ALEN;

	ether_addr_copy(cmd->data.setdelmac.mac, mac);

	return qeth_setdelmac_makerc(card, qeth_send_ipa_cmd(card, iob,

					   NULL, NULL));

}
@@ -123,7 +123,7 @@ static int qeth_l2_send_setmac(struct qeth_card *card, __u8 *mac) 
	rc = qeth_l2_send_setdelmac(card, mac, IPA_CMD_SETVMAC);

	if (rc == 0) {

		card->info.mac_bits |= QETH_LAYER2_MAC_REGISTERED;

		memcpy(card->dev->dev_addr, mac, OSA_ADDR_LEN);

		ether_addr_copy(card->dev->dev_addr, mac);

		dev_info(&card->gdev->dev,

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

			card->dev->dev_addr, card->dev->name);
@@ -532,7 +532,7 @@ static int qeth_l2_set_mac_address(struct net_device *dev, void *p) 
		QETH_CARD_TEXT(card, 3, "setmcTYP");

		return -EOPNOTSUPP;

	}

	QETH_CARD_HEX(card, 3, addr->sa_data, OSA_ADDR_LEN);

	QETH_CARD_HEX(card, 3, addr->sa_data, ETH_ALEN);

	if (qeth_wait_for_threads(card, QETH_RECOVER_THREAD)) {

		QETH_CARD_TEXT(card, 3, "setmcREC");

		return -ERESTARTSYS;
@@ -586,7 +586,7 @@ static void qeth_l2_add_mac(struct qeth_card *card, struct netdev_hw_addr *ha) 
	struct qeth_mac *mac;



	hash_for_each_possible(card->mac_htable, mac, hnode, mac_hash) {

		if (!memcmp(ha->addr, mac->mac_addr, OSA_ADDR_LEN)) {

		if (ether_addr_equal_64bits(ha->addr, mac->mac_addr)) {

			mac->disp_flag = QETH_DISP_ADDR_DO_NOTHING;

			return;

		}
@@ -596,7 +596,7 @@ static void qeth_l2_add_mac(struct qeth_card *card, struct netdev_hw_addr *ha) 
	if (!mac)

		return;



	memcpy(mac->mac_addr, ha->addr, OSA_ADDR_LEN);

	ether_addr_copy(mac->mac_addr, ha->addr);

	mac->disp_flag = QETH_DISP_ADDR_ADD;



	hash_add(card->mac_htable, &mac->hnode, mac_hash);

drivers/s390/net/qeth_l3.h

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ struct qeth_ipaddr { 
	 */

	int  ref_counter;

	enum qeth_prot_versions proto;

	unsigned char mac[OSA_ADDR_LEN];

	unsigned char mac[ETH_ALEN];

	union {

		struct {

			unsigned int addr;