Commit 9de15117 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller
Browse files

s390/qeth: clean up the mac_bits 



We're down to a single bit flag for MAC-address related status, reflect
that in the info struct.
Also set up the flag during initialization instead of clearing it during
shutdown - one more little step towards unifying the shutdown code.

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

drivers/s390/net/qeth_core.h

+1 −2
Original line number Diff line number Diff line
@@ -668,18 +668,17 @@ struct qeth_card_blkt { 


#define QETH_BROADCAST_WITH_ECHO    0x01

#define QETH_BROADCAST_WITHOUT_ECHO 0x02

#define QETH_LAYER2_MAC_REGISTERED  0x02

struct qeth_card_info {

	unsigned short unit_addr2;

	unsigned short cula;

	u8 chpid;

	__u16 func_level;

	char mcl_level[QETH_MCL_LENGTH + 1];

	u8 dev_addr_is_registered:1;

	u8 open_when_online:1;

	u8 promisc_mode:1;

	u8 use_v1_blkt:1;

	u8 is_vm_nic:1;

	int mac_bits;

	enum qeth_card_types type;

	enum qeth_link_types link_type;

	int broadcast_capable;

drivers/s390/net/qeth_l2_main.c

+7 −6
Original line number Diff line number Diff line
@@ -291,7 +291,6 @@ static void qeth_l2_stop_card(struct qeth_card *card) 
	qeth_qdio_clear_card(card, 0);

	qeth_clear_working_pool_list(card);

	flush_workqueue(card->event_wq);

	card->info.mac_bits &= ~QETH_LAYER2_MAC_REGISTERED;

	card->info.promisc_mode = 0;

}
@@ -337,14 +336,16 @@ static void qeth_l2_register_dev_addr(struct qeth_card *card) 
		qeth_l2_request_initial_mac(card);



	if (!IS_OSN(card) && !qeth_l2_send_setmac(card, card->dev->dev_addr))

		card->info.mac_bits |= QETH_LAYER2_MAC_REGISTERED;

		card->info.dev_addr_is_registered = 1;

	else

		card->info.dev_addr_is_registered = 0;

}



static int qeth_l2_validate_addr(struct net_device *dev)

{

	struct qeth_card *card = dev->ml_priv;



	if (card->info.mac_bits & QETH_LAYER2_MAC_REGISTERED)

	if (card->info.dev_addr_is_registered)

		return eth_validate_addr(dev);



	QETH_CARD_TEXT(card, 4, "nomacadr");
@@ -370,7 +371,7 @@ static int qeth_l2_set_mac_address(struct net_device *dev, void *p) 


	/* don't register the same address twice */

	if (ether_addr_equal_64bits(dev->dev_addr, addr->sa_data) &&

	    (card->info.mac_bits & QETH_LAYER2_MAC_REGISTERED))

	    card->info.dev_addr_is_registered)

		return 0;



	/* add the new address, switch over, drop the old */
@@ -380,9 +381,9 @@ static int qeth_l2_set_mac_address(struct net_device *dev, void *p) 
	ether_addr_copy(old_addr, dev->dev_addr);

	ether_addr_copy(dev->dev_addr, addr->sa_data);



	if (card->info.mac_bits & QETH_LAYER2_MAC_REGISTERED)

	if (card->info.dev_addr_is_registered)

		qeth_l2_remove_mac(card, old_addr);

	card->info.mac_bits |= QETH_LAYER2_MAC_REGISTERED;

	card->info.dev_addr_is_registered = 1;

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE