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

Commit d11ba0c4 authored by Peter Tiedemann's avatar Peter Tiedemann Committed by Jeff Garzik
Browse files

qeth: improving debug message handling 



Improving debug message handling, moving ipa into messages from kernel
to dbf, some cleanups and typo fixes.

Signed-off-by: default avatarPeter Tiedemann <ptiedem@de.ibm.com>
Signed-off-by: default avatarFrank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent b7624ec1

drivers/s390/net/qeth_core.h

+41 −52
Original line number Diff line number Diff line
@@ -34,59 +34,53 @@ 


#include "qeth_core_mpc.h"



#define KMSG_COMPONENT "qeth"



/**

 * Debug Facility stuff

 */

#define QETH_DBF_SETUP_NAME "qeth_setup"

#define QETH_DBF_SETUP_LEN 8

#define QETH_DBF_SETUP_PAGES 8

#define QETH_DBF_SETUP_NR_AREAS 1

#define QETH_DBF_SETUP_LEVEL 5



#define QETH_DBF_MISC_NAME "qeth_misc"

#define QETH_DBF_MISC_LEN 128

#define QETH_DBF_MISC_PAGES 2

#define QETH_DBF_MISC_NR_AREAS 1

#define QETH_DBF_MISC_LEVEL 2



#define QETH_DBF_DATA_NAME "qeth_data"

#define QETH_DBF_DATA_LEN 96

#define QETH_DBF_DATA_PAGES 8

#define QETH_DBF_DATA_NR_AREAS 1

#define QETH_DBF_DATA_LEVEL 2



#define QETH_DBF_CONTROL_NAME "qeth_control"

#define QETH_DBF_CONTROL_LEN 256

#define QETH_DBF_CONTROL_PAGES 8

#define QETH_DBF_CONTROL_NR_AREAS 1

#define QETH_DBF_CONTROL_LEVEL 5



#define QETH_DBF_TRACE_NAME "qeth_trace"

#define QETH_DBF_TRACE_LEN 8

#define QETH_DBF_TRACE_PAGES 4

#define QETH_DBF_TRACE_NR_AREAS 1

#define QETH_DBF_TRACE_LEVEL 3



#define QETH_DBF_SENSE_NAME "qeth_sense"

#define QETH_DBF_SENSE_LEN 64

#define QETH_DBF_SENSE_PAGES 2

#define QETH_DBF_SENSE_NR_AREAS 1

#define QETH_DBF_SENSE_LEVEL 2



#define QETH_DBF_QERR_NAME "qeth_qerr"

#define QETH_DBF_QERR_LEN 8

#define QETH_DBF_QERR_PAGES 2

#define QETH_DBF_QERR_NR_AREAS 1

#define QETH_DBF_QERR_LEVEL 2

enum qeth_dbf_names {

	QETH_DBF_SETUP,

	QETH_DBF_QERR,

	QETH_DBF_TRACE,

	QETH_DBF_MSG,

	QETH_DBF_SENSE,

	QETH_DBF_MISC,

	QETH_DBF_CTRL,

	QETH_DBF_INFOS	/* must be last element */

};



struct qeth_dbf_info {

	char name[DEBUG_MAX_NAME_LEN];

	int pages;

	int areas;

	int len;

	int level;

	struct debug_view *view;

	debug_info_t *id;

};



#define QETH_DBF_CTRL_LEN 256



#define QETH_DBF_TEXT(name, level, text) \

	do { \

		debug_text_event(qeth_dbf_##name, level, text); \

	} while (0)

	debug_text_event(qeth_dbf[QETH_DBF_##name].id, level, text)



#define QETH_DBF_HEX(name, level, addr, len) \

	debug_event(qeth_dbf[QETH_DBF_##name].id, level, (void *)(addr), len)



#define QETH_DBF_MESSAGE(level, text...) \

	debug_sprintf_event(qeth_dbf[QETH_DBF_MSG].id, level, text)



#define QETH_DBF_TEXT_(name, level, text...) \

	do { \

		debug_event(qeth_dbf_##name, level, (void *)(addr), len); \

		if (qeth_dbf_passes(qeth_dbf[QETH_DBF_##name].id, level)) { \

			char *dbf_txt_buf = \

				get_cpu_var(QETH_DBF_TXT_BUF); \

			sprintf(dbf_txt_buf, text); \

			debug_text_event(qeth_dbf[QETH_DBF_##name].id, \

					level, dbf_txt_buf); \

			put_cpu_var(QETH_DBF_TXT_BUF); \

		} \

	} while (0)



/* Allow to sort out low debug levels early to avoid wasted sprints */
@@ -826,13 +820,8 @@ void qeth_core_remove_osn_attributes(struct device *); 


/* exports for qeth discipline device drivers */

extern struct qeth_card_list_struct qeth_core_card_list;

extern debug_info_t *qeth_dbf_setup;

extern debug_info_t *qeth_dbf_data;

extern debug_info_t *qeth_dbf_misc;

extern debug_info_t *qeth_dbf_control;

extern debug_info_t *qeth_dbf_trace;

extern debug_info_t *qeth_dbf_sense;

extern debug_info_t *qeth_dbf_qerr;



extern struct qeth_dbf_info qeth_dbf[QETH_DBF_INFOS];



void qeth_set_allowed_threads(struct qeth_card *, unsigned long , int);

int qeth_threads_running(struct qeth_card *, unsigned long);

drivers/s390/net/qeth_core_main.c

+263 −316

File changed.

Preview size limit exceeded, changes collapsed.

drivers/s390/net/qeth_core_mpc.c

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ static struct ipa_cmd_names qeth_ipa_cmd_names[] = { 
	{IPA_CMD_STARTLAN,	"startlan"},

	{IPA_CMD_STOPLAN,	"stoplan"},

	{IPA_CMD_SETVMAC,	"setvmac"},

	{IPA_CMD_DELVMAC,	"delvmca"},

	{IPA_CMD_DELVMAC,	"delvmac"},

	{IPA_CMD_SETGMAC,	"setgmac"},

	{IPA_CMD_DELGMAC,	"delgmac"},

	{IPA_CMD_SETVLAN,	"setvlan"},

drivers/s390/net/qeth_core_offl.c

+30 −30
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ int qeth_eddp_check_buffers_for_context(struct qeth_qdio_out_q *queue, 
	int skbs_in_buffer;

	int buffers_needed = 0;



	QETH_DBF_TEXT(trace, 5, "eddpcbfc");

	QETH_DBF_TEXT(TRACE, 5, "eddpcbfc");

	while (elements_needed > 0) {

		buffers_needed++;

		if (atomic_read(&queue->bufs[index].state) !=
@@ -51,7 +51,7 @@ static void qeth_eddp_free_context(struct qeth_eddp_context *ctx) 
{

	int i;



	QETH_DBF_TEXT(trace, 5, "eddpfctx");

	QETH_DBF_TEXT(TRACE, 5, "eddpfctx");

	for (i = 0; i < ctx->num_pages; ++i)

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

	kfree(ctx->pages);
@@ -76,7 +76,7 @@ void qeth_eddp_buf_release_contexts(struct qeth_qdio_out_buffer *buf) 
{

	struct qeth_eddp_context_reference *ref;



	QETH_DBF_TEXT(trace, 6, "eddprctx");

	QETH_DBF_TEXT(TRACE, 6, "eddprctx");

	while (!list_empty(&buf->ctx_list)) {

		ref = list_entry(buf->ctx_list.next,

				 struct qeth_eddp_context_reference, list);
@@ -91,7 +91,7 @@ static int qeth_eddp_buf_ref_context(struct qeth_qdio_out_buffer *buf, 
{

	struct qeth_eddp_context_reference *ref;



	QETH_DBF_TEXT(trace, 6, "eddprfcx");

	QETH_DBF_TEXT(TRACE, 6, "eddprfcx");

	ref = kmalloc(sizeof(struct qeth_eddp_context_reference), GFP_ATOMIC);

	if (ref == NULL)

		return -ENOMEM;
@@ -112,7 +112,7 @@ int qeth_eddp_fill_buffer(struct qeth_qdio_out_q *queue, 
	int must_refcnt = 1;

	int i;



	QETH_DBF_TEXT(trace, 5, "eddpfibu");

	QETH_DBF_TEXT(TRACE, 5, "eddpfibu");

	while (elements > 0) {

		buf = &queue->bufs[index];

		if (atomic_read(&buf->state) != QETH_QDIO_BUF_EMPTY) {
@@ -166,7 +166,7 @@ int qeth_eddp_fill_buffer(struct qeth_qdio_out_q *queue, 
	}

out_check:

	if (!queue->do_pack) {

		QETH_DBF_TEXT(trace, 6, "fillbfnp");

		QETH_DBF_TEXT(TRACE, 6, "fillbfnp");

		/* set state to PRIMED -> will be flushed */

		if (buf->next_element_to_fill > 0) {

			atomic_set(&buf->state, QETH_QDIO_BUF_PRIMED);
@@ -175,7 +175,7 @@ int qeth_eddp_fill_buffer(struct qeth_qdio_out_q *queue, 
	} else {

		if (queue->card->options.performance_stats)

			queue->card->perf_stats.skbs_sent_pack++;

		QETH_DBF_TEXT(trace, 6, "fillbfpa");

		QETH_DBF_TEXT(TRACE, 6, "fillbfpa");

		if (buf->next_element_to_fill >=

				QETH_MAX_BUFFER_ELEMENTS(queue->card)) {

			/*
@@ -199,7 +199,7 @@ static void qeth_eddp_create_segment_hdrs(struct qeth_eddp_context *ctx, 
	int pkt_len;

	struct qeth_eddp_element *element;



	QETH_DBF_TEXT(trace, 5, "eddpcrsh");

	QETH_DBF_TEXT(TRACE, 5, "eddpcrsh");

	page = ctx->pages[ctx->offset >> PAGE_SHIFT];

	page_offset = ctx->offset % PAGE_SIZE;

	element = &ctx->elements[ctx->num_elements];
@@ -257,7 +257,7 @@ static void qeth_eddp_copy_data_tcp(char *dst, struct qeth_eddp_data *eddp, 
	int copy_len;

	u8 *src;



	QETH_DBF_TEXT(trace, 5, "eddpcdtc");

	QETH_DBF_TEXT(TRACE, 5, "eddpcdtc");

	if (skb_shinfo(eddp->skb)->nr_frags == 0) {

		skb_copy_from_linear_data_offset(eddp->skb, eddp->skb_offset,

						 dst, len);
@@ -305,7 +305,7 @@ static void qeth_eddp_create_segment_data_tcp(struct qeth_eddp_context *ctx, 
	struct qeth_eddp_element *element;

	int first_lap = 1;



	QETH_DBF_TEXT(trace, 5, "eddpcsdt");

	QETH_DBF_TEXT(TRACE, 5, "eddpcsdt");

	page = ctx->pages[ctx->offset >> PAGE_SHIFT];

	page_offset = ctx->offset % PAGE_SIZE;

	element = &ctx->elements[ctx->num_elements];
@@ -346,7 +346,7 @@ static __wsum qeth_eddp_check_tcp4_hdr(struct qeth_eddp_data *eddp, 
{

	__wsum phcsum; /* pseudo header checksum */



	QETH_DBF_TEXT(trace, 5, "eddpckt4");

	QETH_DBF_TEXT(TRACE, 5, "eddpckt4");

	eddp->th.tcp.h.check = 0;

	/* compute pseudo header checksum */

	phcsum = csum_tcpudp_nofold(eddp->nh.ip4.h.saddr, eddp->nh.ip4.h.daddr,
@@ -361,7 +361,7 @@ static __wsum qeth_eddp_check_tcp6_hdr(struct qeth_eddp_data *eddp, 
	__be32 proto;

	__wsum phcsum; /* pseudo header checksum */



	QETH_DBF_TEXT(trace, 5, "eddpckt6");

	QETH_DBF_TEXT(TRACE, 5, "eddpckt6");

	eddp->th.tcp.h.check = 0;

	/* compute pseudo header checksum */

	phcsum = csum_partial((u8 *)&eddp->nh.ip6.h.saddr,
@@ -378,7 +378,7 @@ static struct qeth_eddp_data *qeth_eddp_create_eddp_data(struct qeth_hdr *qh, 
{

	struct qeth_eddp_data *eddp;



	QETH_DBF_TEXT(trace, 5, "eddpcrda");

	QETH_DBF_TEXT(TRACE, 5, "eddpcrda");

	eddp = kzalloc(sizeof(struct qeth_eddp_data), GFP_ATOMIC);

	if (eddp) {

		eddp->nhl = nhl;
@@ -398,7 +398,7 @@ static void __qeth_eddp_fill_context_tcp(struct qeth_eddp_context *ctx, 
	int data_len;

	__wsum hcsum;



	QETH_DBF_TEXT(trace, 5, "eddpftcp");

	QETH_DBF_TEXT(TRACE, 5, "eddpftcp");

	eddp->skb_offset = sizeof(struct qeth_hdr) + eddp->nhl + eddp->thl;

	if (eddp->qh.hdr.l2.id == QETH_HEADER_TYPE_LAYER2) {

		eddp->skb_offset += sizeof(struct ethhdr);
@@ -457,7 +457,7 @@ static int qeth_eddp_fill_context_tcp(struct qeth_eddp_context *ctx, 
{

	struct qeth_eddp_data *eddp = NULL;



	QETH_DBF_TEXT(trace, 5, "eddpficx");

	QETH_DBF_TEXT(TRACE, 5, "eddpficx");

	/* create our segmentation headers and copy original headers */

	if (skb->protocol == htons(ETH_P_IP))

		eddp = qeth_eddp_create_eddp_data(qhdr,
@@ -473,7 +473,7 @@ static int qeth_eddp_fill_context_tcp(struct qeth_eddp_context *ctx, 
						  tcp_hdrlen(skb));



	if (eddp == NULL) {

		QETH_DBF_TEXT(trace, 2, "eddpfcnm");

		QETH_DBF_TEXT(TRACE, 2, "eddpfcnm");

		return -ENOMEM;

	}

	if (qhdr->hdr.l2.id == QETH_HEADER_TYPE_LAYER2) {
@@ -499,7 +499,7 @@ static void qeth_eddp_calc_num_pages(struct qeth_eddp_context *ctx, 
{

	int skbs_per_page;



	QETH_DBF_TEXT(trace, 5, "eddpcanp");

	QETH_DBF_TEXT(TRACE, 5, "eddpcanp");

	/* can we put multiple skbs in one page? */

	skbs_per_page = PAGE_SIZE / (skb_shinfo(skb)->gso_size + hdr_len);

	if (skbs_per_page > 1) {
@@ -524,30 +524,30 @@ static struct qeth_eddp_context *qeth_eddp_create_context_generic( 
	u8 *addr;

	int i;



	QETH_DBF_TEXT(trace, 5, "creddpcg");

	QETH_DBF_TEXT(TRACE, 5, "creddpcg");

	/* create the context and allocate pages */

	ctx = kzalloc(sizeof(struct qeth_eddp_context), GFP_ATOMIC);

	if (ctx == NULL) {

		QETH_DBF_TEXT(trace, 2, "ceddpcn1");

		QETH_DBF_TEXT(TRACE, 2, "ceddpcn1");

		return NULL;

	}

	ctx->type = QETH_LARGE_SEND_EDDP;

	qeth_eddp_calc_num_pages(ctx, skb, hdr_len);

	if (ctx->elements_per_skb > QETH_MAX_BUFFER_ELEMENTS(card)) {

		QETH_DBF_TEXT(trace, 2, "ceddpcis");

		QETH_DBF_TEXT(TRACE, 2, "ceddpcis");

		kfree(ctx);

		return NULL;

	}

	ctx->pages = kcalloc(ctx->num_pages, sizeof(u8 *), GFP_ATOMIC);

	if (ctx->pages == NULL) {

		QETH_DBF_TEXT(trace, 2, "ceddpcn2");

		QETH_DBF_TEXT(TRACE, 2, "ceddpcn2");

		kfree(ctx);

		return NULL;

	}

	for (i = 0; i < ctx->num_pages; ++i) {

		addr = (u8 *)get_zeroed_page(GFP_ATOMIC);

		if (addr == NULL) {

			QETH_DBF_TEXT(trace, 2, "ceddpcn3");

			QETH_DBF_TEXT(TRACE, 2, "ceddpcn3");

			ctx->num_pages = i;

			qeth_eddp_free_context(ctx);

			return NULL;
@@ -557,7 +557,7 @@ static struct qeth_eddp_context *qeth_eddp_create_context_generic( 
	ctx->elements = kcalloc(ctx->num_elements,

				sizeof(struct qeth_eddp_element), GFP_ATOMIC);

	if (ctx->elements == NULL) {

		QETH_DBF_TEXT(trace, 2, "ceddpcn4");

		QETH_DBF_TEXT(TRACE, 2, "ceddpcn4");

		qeth_eddp_free_context(ctx);

		return NULL;

	}
@@ -573,7 +573,7 @@ static struct qeth_eddp_context *qeth_eddp_create_context_tcp( 
{

	struct qeth_eddp_context *ctx = NULL;



	QETH_DBF_TEXT(trace, 5, "creddpct");

	QETH_DBF_TEXT(TRACE, 5, "creddpct");

	if (skb->protocol == htons(ETH_P_IP))

		ctx = qeth_eddp_create_context_generic(card, skb,

						(sizeof(struct qeth_hdr) +
@@ -584,14 +584,14 @@ static struct qeth_eddp_context *qeth_eddp_create_context_tcp( 
			sizeof(struct qeth_hdr) + sizeof(struct ipv6hdr) +

			tcp_hdrlen(skb));

	else

		QETH_DBF_TEXT(trace, 2, "cetcpinv");

		QETH_DBF_TEXT(TRACE, 2, "cetcpinv");



	if (ctx == NULL) {

		QETH_DBF_TEXT(trace, 2, "creddpnl");

		QETH_DBF_TEXT(TRACE, 2, "creddpnl");

		return NULL;

	}

	if (qeth_eddp_fill_context_tcp(ctx, skb, qhdr)) {

		QETH_DBF_TEXT(trace, 2, "ceddptfe");

		QETH_DBF_TEXT(TRACE, 2, "ceddptfe");

		qeth_eddp_free_context(ctx);

		return NULL;

	}
@@ -603,12 +603,12 @@ struct qeth_eddp_context *qeth_eddp_create_context(struct qeth_card *card, 
		struct sk_buff *skb, struct qeth_hdr *qhdr,

		unsigned char sk_protocol)

{

	QETH_DBF_TEXT(trace, 5, "creddpc");

	QETH_DBF_TEXT(TRACE, 5, "creddpc");

	switch (sk_protocol) {

	case IPPROTO_TCP:

		return qeth_eddp_create_context_tcp(card, skb, qhdr);

	default:

		QETH_DBF_TEXT(trace, 2, "eddpinvp");

		QETH_DBF_TEXT(TRACE, 2, "eddpinvp");

	}

	return NULL;

}
@@ -622,7 +622,7 @@ void qeth_tso_fill_header(struct qeth_card *card, struct qeth_hdr *qhdr, 
	struct iphdr *iph = ip_hdr(skb);

	struct ipv6hdr *ip6h = ipv6_hdr(skb);



	QETH_DBF_TEXT(trace, 5, "tsofhdr");

	QETH_DBF_TEXT(TRACE, 5, "tsofhdr");



	/*fix header to TSO values ...*/

	hdr->hdr.hdr.l3.id = QETH_HEADER_TYPE_TSO;

drivers/s390/net/qeth_l2_main.c

+67 −76
Original line number Diff line number Diff line
@@ -22,16 +22,7 @@ 
#include "qeth_core.h"

#include "qeth_core_offl.h"



#define QETH_DBF_TEXT_(name, level, text...) \

	do { \

		if (qeth_dbf_passes(qeth_dbf_##name, level)) { \

			char *dbf_txt_buf = get_cpu_var(qeth_l2_dbf_txt_buf); \

			sprintf(dbf_txt_buf, text); \

			debug_text_event(qeth_dbf_##name, level, dbf_txt_buf); \

			put_cpu_var(qeth_l2_dbf_txt_buf); \

		} \

	} while (0)



#define QETH_DBF_TXT_BUF qeth_l2_dbf_txt_buf

static DEFINE_PER_CPU(char[256], qeth_l2_dbf_txt_buf);



static int qeth_l2_set_offline(struct ccwgroup_device *);
@@ -87,7 +78,7 @@ static int qeth_l2_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) 
		rc = -EOPNOTSUPP;

	}

	if (rc)

		QETH_DBF_TEXT_(trace, 2, "ioce%d", rc);

		QETH_DBF_TEXT_(TRACE, 2, "ioce%d", rc);

	return rc;

}
@@ -141,7 +132,7 @@ static int qeth_l2_send_setgroupmac_cb(struct qeth_card *card, 
	struct qeth_ipa_cmd *cmd;

	__u8 *mac;



	QETH_DBF_TEXT(trace, 2, "L2Sgmacb");

	QETH_DBF_TEXT(TRACE, 2, "L2Sgmacb");

	cmd = (struct qeth_ipa_cmd *) data;

	mac = &cmd->data.setdelmac.mac[0];

	/* MAC already registered, needed in couple/uncouple case */
@@ -162,7 +153,7 @@ static int qeth_l2_send_setgroupmac_cb(struct qeth_card *card, 


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

{

	QETH_DBF_TEXT(trace, 2, "L2Sgmac");

	QETH_DBF_TEXT(TRACE, 2, "L2Sgmac");

	return qeth_l2_send_setdelmac(card, mac, IPA_CMD_SETGMAC,

					  qeth_l2_send_setgroupmac_cb);

}
@@ -174,7 +165,7 @@ static int qeth_l2_send_delgroupmac_cb(struct qeth_card *card, 
	struct qeth_ipa_cmd *cmd;

	__u8 *mac;



	QETH_DBF_TEXT(trace, 2, "L2Dgmacb");

	QETH_DBF_TEXT(TRACE, 2, "L2Dgmacb");

	cmd = (struct qeth_ipa_cmd *) data;

	mac = &cmd->data.setdelmac.mac[0];

	if (cmd->hdr.return_code)
@@ -187,7 +178,7 @@ static int qeth_l2_send_delgroupmac_cb(struct qeth_card *card, 


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

{

	QETH_DBF_TEXT(trace, 2, "L2Dgmac");

	QETH_DBF_TEXT(TRACE, 2, "L2Dgmac");

	return qeth_l2_send_setdelmac(card, mac, IPA_CMD_DELGMAC,

					  qeth_l2_send_delgroupmac_cb);

}
@@ -289,15 +280,15 @@ static int qeth_l2_send_setdelvlan_cb(struct qeth_card *card, 
{

	struct qeth_ipa_cmd *cmd;



	QETH_DBF_TEXT(trace, 2, "L2sdvcb");

	QETH_DBF_TEXT(TRACE, 2, "L2sdvcb");

	cmd = (struct qeth_ipa_cmd *) data;

	if (cmd->hdr.return_code) {

		PRINT_ERR("Error in processing VLAN %i on %s: 0x%x. "

			  "Continuing\n", cmd->data.setdelvlan.vlan_id,

			  QETH_CARD_IFNAME(card), cmd->hdr.return_code);

		QETH_DBF_TEXT_(trace, 2, "L2VL%4x", cmd->hdr.command);

		QETH_DBF_TEXT_(trace, 2, "L2%s", CARD_BUS_ID(card));

		QETH_DBF_TEXT_(trace, 2, "err%d", cmd->hdr.return_code);

		QETH_DBF_TEXT_(TRACE, 2, "L2VL%4x", cmd->hdr.command);

		QETH_DBF_TEXT_(TRACE, 2, "L2%s", CARD_BUS_ID(card));

		QETH_DBF_TEXT_(TRACE, 2, "err%d", cmd->hdr.return_code);

	}

	return 0;

}
@@ -308,7 +299,7 @@ static int qeth_l2_send_setdelvlan(struct qeth_card *card, __u16 i, 
	struct qeth_ipa_cmd *cmd;

	struct qeth_cmd_buffer *iob;



	QETH_DBF_TEXT_(trace, 4, "L2sdv%x", ipacmd);

	QETH_DBF_TEXT_(TRACE, 4, "L2sdv%x", ipacmd);

	iob = qeth_get_ipacmd_buffer(card, ipacmd, QETH_PROT_IPV4);

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

	cmd->data.setdelvlan.vlan_id = i;
@@ -319,7 +310,7 @@ static int qeth_l2_send_setdelvlan(struct qeth_card *card, __u16 i, 
static void qeth_l2_process_vlans(struct qeth_card *card, int clear)

{

	struct qeth_vlan_vid *id;

	QETH_DBF_TEXT(trace, 3, "L2prcvln");

	QETH_DBF_TEXT(TRACE, 3, "L2prcvln");

	spin_lock_bh(&card->vlanlock);

	list_for_each_entry(id, &card->vid_list, list) {

		if (clear)
@@ -337,7 +328,7 @@ static void qeth_l2_vlan_rx_add_vid(struct net_device *dev, unsigned short vid) 
	struct qeth_card *card = netdev_priv(dev);

	struct qeth_vlan_vid *id;



	QETH_DBF_TEXT_(trace, 4, "aid:%d", vid);

	QETH_DBF_TEXT_(TRACE, 4, "aid:%d", vid);

	id = kmalloc(sizeof(struct qeth_vlan_vid), GFP_ATOMIC);

	if (id) {

		id->vid = vid;
@@ -355,7 +346,7 @@ static void qeth_l2_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) 
	struct qeth_vlan_vid *id, *tmpid = NULL;

	struct qeth_card *card = netdev_priv(dev);



	QETH_DBF_TEXT_(trace, 4, "kid:%d", vid);

	QETH_DBF_TEXT_(TRACE, 4, "kid:%d", vid);

	spin_lock_bh(&card->vlanlock);

	list_for_each_entry(id, &card->vid_list, list) {

		if (id->vid == vid) {
@@ -376,8 +367,8 @@ static int qeth_l2_stop_card(struct qeth_card *card, int recovery_mode) 
{

	int rc = 0;



	QETH_DBF_TEXT(setup , 2, "stopcard");

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

	QETH_DBF_TEXT(SETUP , 2, "stopcard");

	QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));



	qeth_set_allowed_threads(card, 0, 1);

	if (qeth_wait_for_threads(card, ~QETH_RECOVER_THREAD))
@@ -396,7 +387,7 @@ static int qeth_l2_stop_card(struct qeth_card *card, int recovery_mode) 
		if (!card->use_hard_stop) {

			__u8 *mac = &card->dev->dev_addr[0];

			rc = qeth_l2_send_delmac(card, mac);

			QETH_DBF_TEXT_(setup, 2, "Lerr%d", rc);

			QETH_DBF_TEXT_(SETUP, 2, "Lerr%d", rc);

		}

		card->state = CARD_STATE_SOFTSETUP;

	}
@@ -465,8 +456,8 @@ static void qeth_l2_process_inbound_buffer(struct qeth_card *card, 
			break;

		default:

			dev_kfree_skb_any(skb);

			QETH_DBF_TEXT(trace, 3, "inbunkno");

			QETH_DBF_HEX(control, 3, hdr, QETH_DBF_CONTROL_LEN);

			QETH_DBF_TEXT(TRACE, 3, "inbunkno");

			QETH_DBF_HEX(CTRL, 3, hdr, QETH_DBF_CTRL_LEN);

			continue;

		}

		card->dev->last_rx = jiffies;
@@ -484,7 +475,7 @@ static int qeth_l2_send_setdelmac(struct qeth_card *card, __u8 *mac, 
	struct qeth_ipa_cmd *cmd;

	struct qeth_cmd_buffer *iob;



	QETH_DBF_TEXT(trace, 2, "L2sdmac");

	QETH_DBF_TEXT(TRACE, 2, "L2sdmac");

	iob = qeth_get_ipacmd_buffer(card, ipacmd, QETH_PROT_IPV4);

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

	cmd->data.setdelmac.mac_length = OSA_ADDR_LEN;
@@ -498,10 +489,10 @@ static int qeth_l2_send_setmac_cb(struct qeth_card *card, 
{

	struct qeth_ipa_cmd *cmd;



	QETH_DBF_TEXT(trace, 2, "L2Smaccb");

	QETH_DBF_TEXT(TRACE, 2, "L2Smaccb");

	cmd = (struct qeth_ipa_cmd *) data;

	if (cmd->hdr.return_code) {

		QETH_DBF_TEXT_(trace, 2, "L2er%x", cmd->hdr.return_code);

		QETH_DBF_TEXT_(TRACE, 2, "L2er%x", cmd->hdr.return_code);

		card->info.mac_bits &= ~QETH_LAYER2_MAC_REGISTERED;

		cmd->hdr.return_code = -EIO;

	} else {
@@ -520,7 +511,7 @@ static int qeth_l2_send_setmac_cb(struct qeth_card *card, 


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

{

	QETH_DBF_TEXT(trace, 2, "L2Setmac");

	QETH_DBF_TEXT(TRACE, 2, "L2Setmac");

	return qeth_l2_send_setdelmac(card, mac, IPA_CMD_SETVMAC,

					  qeth_l2_send_setmac_cb);

}
@@ -531,10 +522,10 @@ static int qeth_l2_send_delmac_cb(struct qeth_card *card, 
{

	struct qeth_ipa_cmd *cmd;



	QETH_DBF_TEXT(trace, 2, "L2Dmaccb");

	QETH_DBF_TEXT(TRACE, 2, "L2Dmaccb");

	cmd = (struct qeth_ipa_cmd *) data;

	if (cmd->hdr.return_code) {

		QETH_DBF_TEXT_(trace, 2, "err%d", cmd->hdr.return_code);

		QETH_DBF_TEXT_(TRACE, 2, "err%d", cmd->hdr.return_code);

		cmd->hdr.return_code = -EIO;

		return 0;

	}
@@ -545,7 +536,7 @@ static int qeth_l2_send_delmac_cb(struct qeth_card *card, 


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

{

	QETH_DBF_TEXT(trace, 2, "L2Delmac");

	QETH_DBF_TEXT(TRACE, 2, "L2Delmac");

	if (!(card->info.mac_bits & QETH_LAYER2_MAC_REGISTERED))

		return 0;

	return qeth_l2_send_setdelmac(card, mac, IPA_CMD_DELVMAC,
@@ -557,8 +548,8 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card) 
	int rc = 0;

	char vendor_pre[] = {0x02, 0x00, 0x00};



	QETH_DBF_TEXT(setup, 2, "doL2init");

	QETH_DBF_TEXT_(setup, 2, "doL2%s", CARD_BUS_ID(card));

	QETH_DBF_TEXT(SETUP, 2, "doL2init");

	QETH_DBF_TEXT_(SETUP, 2, "doL2%s", CARD_BUS_ID(card));



	rc = qeth_query_setadapterparms(card);

	if (rc) {
@@ -572,10 +563,10 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card) 
			PRINT_WARN("couldn't get MAC address on "

			   "device %s: x%x\n",

			   CARD_BUS_ID(card), rc);

			QETH_DBF_TEXT_(setup, 2, "1err%d", rc);

			QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc);

			return rc;

		}

		QETH_DBF_HEX(setup, 2, card->dev->dev_addr, OSA_ADDR_LEN);

		QETH_DBF_HEX(SETUP, 2, card->dev->dev_addr, OSA_ADDR_LEN);

	} else {

		random_ether_addr(card->dev->dev_addr);

		memcpy(card->dev->dev_addr, vendor_pre, 3);
@@ -589,21 +580,21 @@ static int qeth_l2_set_mac_address(struct net_device *dev, void *p) 
	struct qeth_card *card = netdev_priv(dev);

	int rc = 0;



	QETH_DBF_TEXT(trace, 3, "setmac");

	QETH_DBF_TEXT(TRACE, 3, "setmac");



	if (qeth_l2_verify_dev(dev) != QETH_REAL_CARD) {

		QETH_DBF_TEXT(trace, 3, "setmcINV");

		QETH_DBF_TEXT(TRACE, 3, "setmcINV");

		return -EOPNOTSUPP;

	}



	if (card->info.type == QETH_CARD_TYPE_OSN) {

		PRINT_WARN("Setting MAC address on %s is not supported.\n",

			   dev->name);

		QETH_DBF_TEXT(trace, 3, "setmcOSN");

		QETH_DBF_TEXT(TRACE, 3, "setmcOSN");

		return -EOPNOTSUPP;

	}

	QETH_DBF_TEXT_(trace, 3, "%s", CARD_BUS_ID(card));

	QETH_DBF_HEX(trace, 3, addr->sa_data, OSA_ADDR_LEN);

	QETH_DBF_TEXT_(TRACE, 3, "%s", CARD_BUS_ID(card));

	QETH_DBF_HEX(TRACE, 3, addr->sa_data, OSA_ADDR_LEN);

	rc = qeth_l2_send_delmac(card, &card->dev->dev_addr[0]);

	if (!rc)

		rc = qeth_l2_send_setmac(card, addr->sa_data);
@@ -618,7 +609,7 @@ static void qeth_l2_set_multicast_list(struct net_device *dev) 
	if (card->info.type == QETH_CARD_TYPE_OSN)

		return ;



	QETH_DBF_TEXT(trace, 3, "setmulti");

	QETH_DBF_TEXT(TRACE, 3, "setmulti");

	qeth_l2_del_all_mc(card);

	spin_lock_bh(&card->mclock);

	for (dm = dev->mc_list; dm; dm = dm->next)
@@ -644,7 +635,7 @@ static int qeth_l2_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	enum qeth_large_send_types large_send = QETH_LARGE_SEND_NO;

	struct qeth_eddp_context *ctx = NULL;



	QETH_DBF_TEXT(trace, 6, "l2xmit");

	QETH_DBF_TEXT(TRACE, 6, "l2xmit");



	if ((card->state != CARD_STATE_UP) || !card->lan_online) {

		card->stats.tx_carrier_errors++;
@@ -756,7 +747,7 @@ static void qeth_l2_qdio_input_handler(struct ccw_device *ccwdev, 
	int index;

	int i;



	QETH_DBF_TEXT(trace, 6, "qdinput");

	QETH_DBF_TEXT(TRACE, 6, "qdinput");

	card = (struct qeth_card *) card_ptr;

	net_dev = card->dev;

	if (card->options.performance_stats) {
@@ -765,11 +756,11 @@ static void qeth_l2_qdio_input_handler(struct ccw_device *ccwdev, 
	}

	if (status & QDIO_STATUS_LOOK_FOR_ERROR) {

		if (status & QDIO_STATUS_ACTIVATE_CHECK_CONDITION) {

			QETH_DBF_TEXT(trace, 1, "qdinchk");

			QETH_DBF_TEXT_(trace, 1, "%s", CARD_BUS_ID(card));

			QETH_DBF_TEXT_(trace, 1, "%04X%04X", first_element,

			QETH_DBF_TEXT(TRACE, 1, "qdinchk");

			QETH_DBF_TEXT_(TRACE, 1, "%s", CARD_BUS_ID(card));

			QETH_DBF_TEXT_(TRACE, 1, "%04X%04X", first_element,

					count);

			QETH_DBF_TEXT_(trace, 1, "%04X%04X", queue, status);

			QETH_DBF_TEXT_(TRACE, 1, "%04X%04X", queue, status);

			qeth_schedule_recovery(card);

			return;

		}
@@ -794,13 +785,13 @@ static int qeth_l2_open(struct net_device *dev) 
{

	struct qeth_card *card = netdev_priv(dev);



	QETH_DBF_TEXT(trace, 4, "qethopen");

	QETH_DBF_TEXT(TRACE, 4, "qethopen");

	if (card->state != CARD_STATE_SOFTSETUP)

		return -ENODEV;



	if ((card->info.type != QETH_CARD_TYPE_OSN) &&

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

		QETH_DBF_TEXT(trace, 4, "nomacadr");

		QETH_DBF_TEXT(TRACE, 4, "nomacadr");

		return -EPERM;

	}

	card->data.state = CH_STATE_UP;
@@ -818,7 +809,7 @@ static int qeth_l2_stop(struct net_device *dev) 
{

	struct qeth_card *card = netdev_priv(dev);



	QETH_DBF_TEXT(trace, 4, "qethstop");

	QETH_DBF_TEXT(TRACE, 4, "qethstop");

	netif_tx_disable(dev);

	card->dev->flags &= ~IFF_UP;

	if (card->state == CARD_STATE_UP)
@@ -934,8 +925,8 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode) 
	enum qeth_card_states recover_flag;



	BUG_ON(!card);

	QETH_DBF_TEXT(setup, 2, "setonlin");

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

	QETH_DBF_TEXT(SETUP, 2, "setonlin");

	QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));



	qeth_set_allowed_threads(card, QETH_RECOVER_THREAD, 1);

	if (qeth_wait_for_threads(card, ~QETH_RECOVER_THREAD)) {
@@ -947,23 +938,23 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode) 
	recover_flag = card->state;

	rc = ccw_device_set_online(CARD_RDEV(card));

	if (rc) {

		QETH_DBF_TEXT_(setup, 2, "1err%d", rc);

		QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc);

		return -EIO;

	}

	rc = ccw_device_set_online(CARD_WDEV(card));

	if (rc) {

		QETH_DBF_TEXT_(setup, 2, "1err%d", rc);

		QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc);

		return -EIO;

	}

	rc = ccw_device_set_online(CARD_DDEV(card));

	if (rc) {

		QETH_DBF_TEXT_(setup, 2, "1err%d", rc);

		QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc);

		return -EIO;

	}



	rc = qeth_core_hardsetup_card(card);

	if (rc) {

		QETH_DBF_TEXT_(setup, 2, "2err%d", rc);

		QETH_DBF_TEXT_(SETUP, 2, "2err%d", rc);

		goto out_remove;

	}
@@ -977,11 +968,11 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode) 
	qeth_print_status_message(card);



	/* softsetup */

	QETH_DBF_TEXT(setup, 2, "softsetp");

	QETH_DBF_TEXT(SETUP, 2, "softsetp");



	rc = qeth_send_startlan(card);

	if (rc) {

		QETH_DBF_TEXT_(setup, 2, "1err%d", rc);

		QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc);

		if (rc == 0xe080) {

			PRINT_WARN("LAN on card %s if offline! "

				   "Waiting for STARTLAN from card.\n",
@@ -1001,7 +992,7 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode) 


	rc = qeth_init_qdio_queues(card);

	if (rc) {

		QETH_DBF_TEXT_(setup, 2, "6err%d", rc);

		QETH_DBF_TEXT_(SETUP, 2, "6err%d", rc);

		goto out_remove;

	}

	card->state = CARD_STATE_SOFTSETUP;
@@ -1048,8 +1039,8 @@ static int __qeth_l2_set_offline(struct ccwgroup_device *cgdev, 
	int rc = 0, rc2 = 0, rc3 = 0;

	enum qeth_card_states recover_flag;



	QETH_DBF_TEXT(setup, 3, "setoffl");

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

	QETH_DBF_TEXT(SETUP, 3, "setoffl");

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



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

		netif_carrier_off(card->dev);
@@ -1065,7 +1056,7 @@ static int __qeth_l2_set_offline(struct ccwgroup_device *cgdev, 
	if (!rc)

		rc = (rc2) ? rc2 : rc3;

	if (rc)

		QETH_DBF_TEXT_(setup, 2, "1err%d", rc);

		QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc);

	if (recover_flag == CARD_STATE_UP)

		card->state = CARD_STATE_RECOVER;

	/* let user_space know that device is offline */
@@ -1084,11 +1075,11 @@ static int qeth_l2_recover(void *ptr) 
	int rc = 0;



	card = (struct qeth_card *) ptr;

	QETH_DBF_TEXT(trace, 2, "recover1");

	QETH_DBF_HEX(trace, 2, &card, sizeof(void *));

	QETH_DBF_TEXT(TRACE, 2, "recover1");

	QETH_DBF_HEX(TRACE, 2, &card, sizeof(void *));

	if (!qeth_do_run_thread(card, QETH_RECOVER_THREAD))

		return 0;

	QETH_DBF_TEXT(trace, 2, "recover2");

	QETH_DBF_TEXT(TRACE, 2, "recover2");

	PRINT_WARN("Recovery of device %s started ...\n",

		   CARD_BUS_ID(card));

	card->use_hard_stop = 1;
@@ -1139,12 +1130,12 @@ static int qeth_osn_send_control_data(struct qeth_card *card, int len, 
	unsigned long flags;

	int rc = 0;



	QETH_DBF_TEXT(trace, 5, "osndctrd");

	QETH_DBF_TEXT(TRACE, 5, "osndctrd");



	wait_event(card->wait_q,

		   atomic_cmpxchg(&card->write.irq_pending, 0, 1) == 0);

	qeth_prepare_control_data(card, len, iob);

	QETH_DBF_TEXT(trace, 6, "osnoirqp");

	QETH_DBF_TEXT(TRACE, 6, "osnoirqp");

	spin_lock_irqsave(get_ccwdev_lock(card->write.ccwdev), flags);

	rc = ccw_device_start(card->write.ccwdev, &card->write.ccw,

			      (addr_t) iob, 0, 0);
@@ -1152,7 +1143,7 @@ static int qeth_osn_send_control_data(struct qeth_card *card, int len, 
	if (rc) {

		PRINT_WARN("qeth_osn_send_control_data: "

			   "ccw_device_start rc = %i\n", rc);

		QETH_DBF_TEXT_(trace, 2, " err%d", rc);

		QETH_DBF_TEXT_(TRACE, 2, " err%d", rc);

		qeth_release_buffer(iob->channel, iob);

		atomic_set(&card->write.irq_pending, 0);

		wake_up(&card->wait_q);
@@ -1165,7 +1156,7 @@ static int qeth_osn_send_ipa_cmd(struct qeth_card *card, 
{

	u16 s1, s2;



	QETH_DBF_TEXT(trace, 4, "osndipa");

	QETH_DBF_TEXT(TRACE, 4, "osndipa");



	qeth_prepare_ipa_cmd(card, iob, QETH_PROT_OSN2);

	s1 = (u16)(IPA_PDU_HEADER_SIZE + data_len);
@@ -1183,7 +1174,7 @@ int qeth_osn_assist(struct net_device *dev, void *data, int data_len) 
	struct qeth_card *card;

	int rc;



	QETH_DBF_TEXT(trace, 2, "osnsdmc");

	QETH_DBF_TEXT(TRACE, 2, "osnsdmc");

	if (!dev)

		return -ENODEV;

	card = netdev_priv(dev);
@@ -1205,7 +1196,7 @@ int qeth_osn_register(unsigned char *read_dev_no, struct net_device **dev, 
{

	struct qeth_card *card;



	QETH_DBF_TEXT(trace, 2, "osnreg");

	QETH_DBF_TEXT(TRACE, 2, "osnreg");

	*dev = qeth_l2_netdev_by_devno(read_dev_no);

	if (*dev == NULL)

		return -ENODEV;
@@ -1224,7 +1215,7 @@ void qeth_osn_deregister(struct net_device *dev) 
{

	struct qeth_card *card;



	QETH_DBF_TEXT(trace, 2, "osndereg");

	QETH_DBF_TEXT(TRACE, 2, "osndereg");

	if (!dev)

		return;

	card = netdev_priv(dev);