Commit 4965e97f authored by Frank Pavlic's avatar Frank Pavlic Committed by Jeff Garzik
Browse files

[PATCH] s390: minor qeth network driver fixes 



[patch 2/3] s390: minor qeth network driver fixes

From: Frank Pavlic <pavlic@de.ibm.com>
	- use netif_carrier_on/off calls to tell network stack
	  link carrier state
	- fix possible kfree on NULL
	- PDU_LEN2 is at offset 0x29 otherwise OSN chpid won't initialize

Signed-off-by: default avatarFrank Pavlic <pavlic@de.ibm.com>

diffstat:
 qeth_eddp.c |    3 ++-
 qeth_main.c |   17 +++++++----------
 qeth_mpc.h  |    2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 6c6b3e7c

drivers/s390/net/qeth_eddp.c

+2 −1
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ qeth_eddp_free_context(struct qeth_eddp_context *ctx) 
	for (i = 0; i < ctx->num_pages; ++i)

		free_page((unsigned long)ctx->pages[i]);

	kfree(ctx->pages);

	if (ctx->elements != NULL)

		kfree(ctx->elements);

	kfree(ctx);

}

drivers/s390/net/qeth_main.c

+7 −10
Original line number Diff line number Diff line
@@ -519,6 +519,7 @@ __qeth_set_offline(struct ccwgroup_device *cgdev, int recovery_mode) 
	QETH_DBF_TEXT(setup, 3, "setoffl");

	QETH_DBF_HEX(setup, 3, &card, sizeof(void *));

	

	netif_carrier_off(card->dev);

	recover_flag = card->state;

	if (qeth_stop_card(card, recovery_mode) == -ERESTARTSYS){

		PRINT_WARN("Stopping card %s interrupted by user!\n",
@@ -1020,7 +1021,6 @@ void 
qeth_schedule_recovery(struct qeth_card *card)

{

	QETH_DBF_TEXT(trace,2,"startrec");



	if (qeth_set_thread_start_bit(card, QETH_RECOVER_THREAD) == 0)

		schedule_work(&card->kernel_thread_starter);

}
@@ -1710,7 +1710,6 @@ qeth_check_ipa_data(struct qeth_card *card, struct qeth_cmd_buffer *iob) 
					   "IP address reset.\n",

					   QETH_CARD_IFNAME(card),

					   card->info.chpid);

				netif_carrier_on(card->dev);

				qeth_schedule_recovery(card);

				return NULL;

			case IPA_CMD_MODCCID:
@@ -3809,10 +3808,8 @@ qeth_open(struct net_device *dev) 
	card->data.state = CH_STATE_UP;

	card->state = CARD_STATE_UP;



	if (!card->lan_online){

		if (netif_carrier_ok(dev))

	if (!card->lan_online && netif_carrier_ok(dev))

		netif_carrier_off(dev);

	}

	return 0;

}
@@ -7936,8 +7933,8 @@ __qeth_set_online(struct ccwgroup_device *gdev, int recovery_mode) 
		QETH_DBF_TEXT_(setup, 2, "6err%d", rc);

		goto out_remove;

	}

/*maybe it was set offline without ifconfig down

 * we can also use this state for recovery purposes*/

	netif_carrier_on(card->dev);



	qeth_set_allowed_threads(card, 0xffffffff, 0);

	if (recover_flag == CARD_STATE_RECOVER)

		qeth_start_again(card, recovery_mode);

drivers/s390/net/qeth_mpc.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ extern const char *VERSION_QETH_MPC_C; 
#define IPA_PDU_HEADER_SIZE	0x40

#define QETH_IPA_PDU_LEN_TOTAL(buffer) (buffer+0x0e)

#define QETH_IPA_PDU_LEN_PDU1(buffer) (buffer+0x26)

#define QETH_IPA_PDU_LEN_PDU2(buffer) (buffer+0x2a)

#define QETH_IPA_PDU_LEN_PDU2(buffer) (buffer+0x29)

#define QETH_IPA_PDU_LEN_PDU3(buffer) (buffer+0x3a)



extern unsigned char IPA_PDU_HEADER[];

CRA Git | Maintained and supported by SUSTech CRA and CCSE