Commit 14cc21b6 authored by Frank Blaschka's avatar Frank Blaschka Committed by Jeff Garzik
Browse files

qeth: reduce number of kernel messages 



Remove unnecessary messages. Write important debug information to
s390dbf.

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

drivers/s390/net/qeth_core_main.c

+7 −23
Original line number Diff line number Diff line
@@ -290,9 +290,6 @@ int qeth_set_large_send(struct qeth_card *card, 
			card->dev->features |= NETIF_F_TSO | NETIF_F_SG |

						NETIF_F_HW_CSUM;

		} else {

			PRINT_WARN("TSO not supported on %s. "

				   "large_send set to 'no'.\n",

				   card->dev->name);

			card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG |

						NETIF_F_HW_CSUM);

			card->options.large_send = QETH_LARGE_SEND_NO;
@@ -1433,7 +1430,7 @@ static int qeth_idx_activate_get_answer(struct qeth_channel *channel, 
	spin_unlock_irqrestore(get_ccwdev_lock(channel->ccwdev), flags);



	if (rc) {

		PRINT_ERR("Error2 in activating channel rc=%d\n", rc);

		QETH_DBF_MESSAGE(2, "Error2 in activating channel rc=%d\n", rc);

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

		atomic_set(&channel->irq_pending, 0);

		wake_up(&card->wait_q);
@@ -1503,7 +1500,8 @@ static int qeth_idx_activate_channel(struct qeth_channel *channel, 
	spin_unlock_irqrestore(get_ccwdev_lock(channel->ccwdev), flags);



	if (rc) {

		PRINT_ERR("Error1 in activating channel. rc=%d\n", rc);

		QETH_DBF_MESSAGE(2, "Error1 in activating channel. rc=%d\n",

			rc);

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

		atomic_set(&channel->irq_pending, 0);

		wake_up(&card->wait_q);
@@ -1653,7 +1651,6 @@ int qeth_send_control_data(struct qeth_card *card, int len, 


	reply = qeth_alloc_reply(card);

	if (!reply) {

		PRINT_WARN("Could not alloc qeth_reply!\n");

		return -ENOMEM;

	}

	reply->callback = reply_cb;
@@ -2607,15 +2604,9 @@ void qeth_queue_input_buffer(struct qeth_card *card, int index) 
		if (newcount < count) {

			/* we are in memory shortage so we switch back to

			   traditional skb allocation and drop packages */

			if (!atomic_read(&card->force_alloc_skb) &&

			    net_ratelimit())

				PRINT_WARN("Switch to alloc skb\n");

			atomic_set(&card->force_alloc_skb, 3);

			count = newcount;

		} else {

			if ((atomic_read(&card->force_alloc_skb) == 1) &&

			    net_ratelimit())

				PRINT_WARN("Switch to sg\n");

			atomic_add_unless(&card->force_alloc_skb, -1, 0);

		}
@@ -3029,7 +3020,7 @@ int qeth_get_elements_no(struct qeth_card *card, void *hdr, 
		elements_needed = 1 + (((((unsigned long) hdr) % PAGE_SIZE)

			+ skb->len) >> PAGE_SHIFT);

	if ((elements_needed + elems) > QETH_MAX_BUFFER_ELEMENTS(card)) {

		PRINT_ERR("Invalid size of IP packet "

		QETH_DBF_MESSAGE(2, "Invalid size of IP packet "

			"(Number=%d / Length=%d). Discarded.\n",

			(elements_needed+elems), skb->len);

		return 0;
@@ -3242,8 +3233,6 @@ int qeth_do_send_packet(struct qeth_card *card, struct qeth_qdio_out_q *queue, 
			 * free buffers) to handle eddp context */

			if (qeth_eddp_check_buffers_for_context(queue, ctx)

				< 0) {

				if (net_ratelimit())

					PRINT_WARN("eddp tx_dropped 1\n");

				rc = -EBUSY;

				goto out;

			}
@@ -3255,7 +3244,6 @@ int qeth_do_send_packet(struct qeth_card *card, struct qeth_qdio_out_q *queue, 
		tmp = qeth_eddp_fill_buffer(queue, ctx,

						queue->next_buf_to_fill);

		if (tmp < 0) {

			PRINT_ERR("eddp tx_dropped 2\n");

			rc = -EBUSY;

			goto out;

		}
@@ -3597,8 +3585,6 @@ int qeth_snmp_command(struct qeth_card *card, char __user *udata) 


	if ((!qeth_adp_supported(card, IPA_SETADP_SET_SNMP_CONTROL)) &&

	    (!card->options.layer2)) {

		PRINT_WARN("SNMP Query MIBS not supported "

			   "on %s!\n", QETH_CARD_IFNAME(card));

		return -EOPNOTSUPP;

	}

	/* skip 4 bytes (data_len struct member) to get req_len */
@@ -3629,7 +3615,7 @@ int qeth_snmp_command(struct qeth_card *card, char __user *udata) 
	rc = qeth_send_ipa_snmp_cmd(card, iob, QETH_SETADP_BASE_LEN + req_len,

				    qeth_snmp_command_cb, (void *)&qinfo);

	if (rc)

		PRINT_WARN("SNMP command failed on %s: (0x%x)\n",

		QETH_DBF_MESSAGE(2, "SNMP command failed on %s: (0x%x)\n",

			   QETH_CARD_IFNAME(card), rc);

	else {

		if (copy_to_user(udata, qinfo.udata, qinfo.udata_len))
@@ -3802,8 +3788,8 @@ retry: 
	if (mpno)

		mpno = min(mpno - 1, QETH_MAX_PORTNO);

	if (card->info.portno > mpno) {

		PRINT_ERR("Device %s does not offer port number %d \n.",

			CARD_BUS_ID(card), card->info.portno);

		QETH_DBF_MESSAGE(2, "Device %s does not offer port number %d"

			"\n.", CARD_BUS_ID(card), card->info.portno);

		rc = -ENODEV;

		goto out;

	}
@@ -3980,8 +3966,6 @@ struct sk_buff *qeth_core_get_next_skb(struct qeth_card *card, 
	return skb;

no_mem:

	if (net_ratelimit()) {

		PRINT_WARN("No memory for packet received on %s.\n",

			   QETH_CARD_IFNAME(card));

		QETH_DBF_TEXT(TRACE, 2, "noskbmem");

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

	}

drivers/s390/net/qeth_core_offl.c

+2 −4
Original line number Diff line number Diff line
@@ -122,8 +122,8 @@ int qeth_eddp_fill_buffer(struct qeth_qdio_out_q *queue, 
			if (element == 0)

				return -EBUSY;

			else {

				PRINT_WARN("could only partially fill eddp "

					   "buffer!\n");

				QETH_DBF_MESSAGE(2, "could only partially fill"

					"eddp buffer!\n");

				goto out;

			}

		}
@@ -143,8 +143,6 @@ int qeth_eddp_fill_buffer(struct qeth_qdio_out_q *queue, 
		if (must_refcnt) {

			must_refcnt = 0;

			if (qeth_eddp_buf_ref_context(buf, ctx)) {

				PRINT_WARN("no memory to create eddp context "

					   "reference\n");

				goto out_check;

			}

		}

drivers/s390/net/qeth_core_sys.c

+0 −12
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ static ssize_t qeth_dev_portno_store(struct device *dev, 


	portno = simple_strtoul(buf, &tmp, 16);

	if (portno > QETH_MAX_PORTNO) {

		PRINT_WARN("portno 0x%X is out of range\n", portno);

		return -EINVAL;

	}
@@ -223,8 +222,6 @@ static ssize_t qeth_dev_prioqing_store(struct device *dev, 
	 * if though we have to permit priority queueing

	 */

	if (card->qdio.no_out_queues == 1) {

		PRINT_WARN("Priority queueing disabled due "

			   "to hardware limitations!\n");

		card->qdio.do_prio_queueing = QETH_PRIOQ_DEFAULT;

		return -EPERM;

	}
@@ -250,7 +247,6 @@ static ssize_t qeth_dev_prioqing_store(struct device *dev, 
		card->qdio.do_prio_queueing = QETH_NO_PRIO_QUEUEING;

		card->qdio.default_out_queue = QETH_DEFAULT_QUEUE;

	} else {

		PRINT_WARN("Unknown queueing type '%s'\n", tmp);

		return -EINVAL;

	}

	return count;
@@ -291,9 +287,6 @@ static ssize_t qeth_dev_bufcnt_store(struct device *dev, 
		((cnt > QETH_IN_BUF_COUNT_MAX) ? QETH_IN_BUF_COUNT_MAX : cnt);

	if (old_cnt != cnt) {

		rc = qeth_realloc_buffer_pool(card, cnt);

		if (rc)

			PRINT_WARN("Error (%d) while setting "

				   "buffer count.\n", rc);

	}

	return count;

}
@@ -355,7 +348,6 @@ static ssize_t qeth_dev_performance_stats_store(struct device *dev, 
		card->perf_stats.initial_rx_packets = card->stats.rx_packets;

		card->perf_stats.initial_tx_packets = card->stats.tx_packets;

	} else {

		PRINT_WARN("performance_stats: write 0 or 1 to this file!\n");

		return -EINVAL;

	}

	return count;
@@ -399,7 +391,6 @@ static ssize_t qeth_dev_layer2_store(struct device *dev, 
		newdis = QETH_DISCIPLINE_LAYER2;

		break;

	default:

		PRINT_WARN("layer2: write 0 or 1 to this file!\n");

		return -EINVAL;

	}
@@ -463,7 +454,6 @@ static ssize_t qeth_dev_large_send_store(struct device *dev, 
	} else if (!strcmp(tmp, "TSO")) {

		type = QETH_LARGE_SEND_TSO;

	} else {

		PRINT_WARN("large_send: invalid mode %s!\n", tmp);

		return -EINVAL;

	}

	if (card->options.large_send == type)
@@ -503,8 +493,6 @@ static ssize_t qeth_dev_blkt_store(struct qeth_card *card, 
	if (i <= max_value) {

		*value = i;

	} else {

		PRINT_WARN("blkt total time: write values between"

			   " 0 and %d to this file!\n", max_value);

		return -EINVAL;

	}

	return count;

drivers/s390/net/qeth_l2_main.c

+11 −18
Original line number Diff line number Diff line
@@ -131,14 +131,14 @@ static int qeth_l2_send_setgroupmac_cb(struct qeth_card *card, 
	mac = &cmd->data.setdelmac.mac[0];

	/* MAC already registered, needed in couple/uncouple case */

	if (cmd->hdr.return_code == 0x2005) {

		PRINT_WARN("Group MAC %02x:%02x:%02x:%02x:%02x:%02x " \

		QETH_DBF_MESSAGE(2, "Group MAC %02x:%02x:%02x:%02x:%02x:%02x "

			  "already existing on %s \n",

			  mac[0], mac[1], mac[2], mac[3], mac[4], mac[5],

			  QETH_CARD_IFNAME(card));

		cmd->hdr.return_code = 0;

	}

	if (cmd->hdr.return_code)

		PRINT_ERR("Could not set group MAC " \

		QETH_DBF_MESSAGE(2, "Could not set group MAC "

			  "%02x:%02x:%02x:%02x:%02x:%02x on %s: %x\n",

			  mac[0], mac[1], mac[2], mac[3], mac[4], mac[5],

			  QETH_CARD_IFNAME(card), cmd->hdr.return_code);
@@ -163,7 +163,7 @@ static int qeth_l2_send_delgroupmac_cb(struct qeth_card *card, 
	cmd = (struct qeth_ipa_cmd *) data;

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

	if (cmd->hdr.return_code)

		PRINT_ERR("Could not delete group MAC " \

		QETH_DBF_MESSAGE(2, "Could not delete group MAC "

			  "%02x:%02x:%02x:%02x:%02x:%02x on %s: %x\n",

			  mac[0], mac[1], mac[2], mac[3], mac[4], mac[5],

			  QETH_CARD_IFNAME(card), cmd->hdr.return_code);
@@ -183,10 +183,8 @@ static void qeth_l2_add_mc(struct qeth_card *card, __u8 *mac) 


	mc = kmalloc(sizeof(struct qeth_mc_mac), GFP_ATOMIC);



	if (!mc) {

		PRINT_ERR("no mem vor mc mac address\n");

	if (!mc)

		return;

	}



	memcpy(mc->mc_addr, mac, OSA_ADDR_LEN);

	mc->mc_addrlen = OSA_ADDR_LEN;
@@ -277,7 +275,7 @@ static int qeth_l2_send_setdelvlan_cb(struct qeth_card *card, 
	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. "

		QETH_DBF_MESSAGE(2, "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);
@@ -330,8 +328,6 @@ static void qeth_l2_vlan_rx_add_vid(struct net_device *dev, unsigned short vid) 
		spin_lock_bh(&card->vlanlock);

		list_add_tail(&id->list, &card->vid_list);

		spin_unlock_bh(&card->vlanlock);

	} else {

		PRINT_ERR("no memory for vid\n");

	}

}
@@ -547,16 +543,15 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card) 


	rc = qeth_query_setadapterparms(card);

	if (rc) {

		PRINT_WARN("could not query adapter parameters on device %s: "

			   "x%x\n", CARD_BUS_ID(card), rc);

		QETH_DBF_MESSAGE(2, "could not query adapter parameters on "

			"device %s: x%x\n", CARD_BUS_ID(card), rc);

	}



	if (card->info.guestlan) {

		rc = qeth_setadpparms_change_macaddr(card);

		if (rc) {

			PRINT_WARN("couldn't get MAC address on "

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

			   CARD_BUS_ID(card), rc);

			QETH_DBF_MESSAGE(2, "couldn't get MAC address on "

				"device %s: x%x\n", CARD_BUS_ID(card), rc);

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

			return rc;

		}
@@ -582,8 +577,6 @@ static int qeth_l2_set_mac_address(struct net_device *dev, void *p) 
	}



	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");

		return -EOPNOTSUPP;

	}
@@ -663,7 +656,7 @@ static int qeth_l2_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) 
		ctx = qeth_eddp_create_context(card, new_skb, hdr,

						skb->sk->sk_protocol);

		if (ctx == NULL) {

			PRINT_WARN("could not create eddp context\n");

			QETH_DBF_MESSAGE(2, "could not create eddp context\n");

			goto tx_drop;

		}

	} else {
@@ -1152,7 +1145,7 @@ static int qeth_osn_send_control_data(struct qeth_card *card, int len, 
			      (addr_t) iob, 0, 0);

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

	if (rc) {

		PRINT_WARN("qeth_osn_send_control_data: "

		QETH_DBF_MESSAGE(2, "qeth_osn_send_control_data: "

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

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

		qeth_release_buffer(iob->channel, iob);

drivers/s390/net/qeth_l3_main.c

+22 −50
Original line number Diff line number Diff line
@@ -311,7 +311,6 @@ static struct qeth_ipaddr *qeth_l3_get_addr_buffer( 


	addr = kzalloc(sizeof(struct qeth_ipaddr), GFP_ATOMIC);

	if (addr == NULL) {

		PRINT_WARN("Not enough memory to add address\n");

		return NULL;

	}

	addr->type = QETH_IP_TYPE_NORMAL;
@@ -649,15 +648,6 @@ static void qeth_l3_correct_routing_type(struct qeth_card *card, 
		}

	}

out_inval:

	PRINT_WARN("Routing type '%s' not supported for interface %s.\n"

		   "Router status set to 'no router'.\n",

		   ((*type == PRIMARY_ROUTER)? "primary router" :

		    (*type == SECONDARY_ROUTER)? "secondary router" :

		    (*type == PRIMARY_CONNECTOR)? "primary connector" :

		    (*type == SECONDARY_CONNECTOR)? "secondary connector" :

		    (*type == MULTICAST_ROUTER)? "multicast router" :

		    "unknown"),

		   card->dev->name);

	*type = NO_ROUTER;

}
@@ -674,9 +664,9 @@ int qeth_l3_setrouting_v4(struct qeth_card *card) 
				  QETH_PROT_IPV4);

	if (rc) {

		card->options.route4.type = NO_ROUTER;

		PRINT_WARN("Error (0x%04x) while setting routing type on %s. "

			   "Type set to 'no router'.\n",

			   rc, QETH_CARD_IFNAME(card));

		QETH_DBF_MESSAGE(2, "Error (0x%04x) while setting routing type"

			" on %s. Type set to 'no router'.\n", rc,

			QETH_CARD_IFNAME(card));

	}

	return rc;

}
@@ -697,9 +687,9 @@ int qeth_l3_setrouting_v6(struct qeth_card *card) 
				  QETH_PROT_IPV6);

	if (rc) {

		card->options.route6.type = NO_ROUTER;

		PRINT_WARN("Error (0x%04x) while setting routing type on %s. "

			   "Type set to 'no router'.\n",

			   rc, QETH_CARD_IFNAME(card));

		QETH_DBF_MESSAGE(2, "Error (0x%04x) while setting routing type"

			" on %s. Type set to 'no router'.\n", rc,

			QETH_CARD_IFNAME(card));

	}

#endif

	return rc;
@@ -737,7 +727,6 @@ int qeth_l3_add_ipato_entry(struct qeth_card *card, 
		if (!memcmp(ipatoe->addr, new->addr,

			    (ipatoe->proto == QETH_PROT_IPV4)? 4:16) &&

		    (ipatoe->mask_bits == new->mask_bits)) {

			PRINT_WARN("ipato entry already exists!\n");

			rc = -EEXIST;

			break;

		}
@@ -802,7 +791,6 @@ int qeth_l3_add_vipa(struct qeth_card *card, enum qeth_prot_versions proto, 
		rc = -EEXIST;

	spin_unlock_irqrestore(&card->ip_lock, flags);

	if (rc) {

		PRINT_WARN("Cannot add VIPA. Address already exists!\n");

		return rc;

	}

	if (!qeth_l3_add_ip(card, ipaddr))
@@ -867,7 +855,6 @@ int qeth_l3_add_rxip(struct qeth_card *card, enum qeth_prot_versions proto, 
		rc = -EEXIST;

	spin_unlock_irqrestore(&card->ip_lock, flags);

	if (rc) {

		PRINT_WARN("Cannot add RXIP. Address already exists!\n");

		return rc;

	}

	if (!qeth_l3_add_ip(card, ipaddr))
@@ -1020,23 +1007,23 @@ static int qeth_l3_setadapter_hstr(struct qeth_card *card) 
					IPA_SETADP_SET_BROADCAST_MODE,

					card->options.broadcast_mode);

		if (rc)

			PRINT_WARN("couldn't set broadcast mode on "

			QETH_DBF_MESSAGE(2, "couldn't set broadcast mode on "

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

				   CARD_BUS_ID(card), rc);

		rc = qeth_l3_send_setadp_mode(card,

					IPA_SETADP_ALTER_MAC_ADDRESS,

					card->options.macaddr_mode);

		if (rc)

			PRINT_WARN("couldn't set macaddr mode on "

			QETH_DBF_MESSAGE(2, "couldn't set macaddr mode on "

				   "device %s: x%x\n", CARD_BUS_ID(card), rc);

		return rc;

	}

	if (card->options.broadcast_mode == QETH_TR_BROADCAST_LOCAL)

		PRINT_WARN("set adapter parameters not available "

		QETH_DBF_MESSAGE(2, "set adapter parameters not available "

			   "to set broadcast mode, using ALLRINGS "

			   "on device %s:\n", CARD_BUS_ID(card));

	if (card->options.macaddr_mode == QETH_TR_MACADDR_CANONICAL)

		PRINT_WARN("set adapter parameters not available "

		QETH_DBF_MESSAGE(2, "set adapter parameters not available "

			   "to set macaddr mode, using NONCANONICAL "

			   "on device %s:\n", CARD_BUS_ID(card));

	return 0;
@@ -2182,8 +2169,6 @@ static int qeth_l3_arp_set_no_entries(struct qeth_card *card, int no_entries) 
	if (card->info.guestlan)

		return -EOPNOTSUPP;

	if (!qeth_is_supported(card, IPA_ARP_PROCESSING)) {

		PRINT_WARN("ARP processing not supported "

			   "on %s!\n", QETH_CARD_IFNAME(card));

		return -EOPNOTSUPP;

	}

	rc = qeth_l3_send_simple_setassparms(card, IPA_ARP_PROCESSING,
@@ -2191,8 +2176,8 @@ static int qeth_l3_arp_set_no_entries(struct qeth_card *card, int no_entries) 
					  no_entries);

	if (rc) {

		tmp = rc;

		PRINT_WARN("Could not set number of ARP entries on %s: "

			"%s (0x%x/%d)\n", QETH_CARD_IFNAME(card),

		QETH_DBF_MESSAGE(2, "Could not set number of ARP entries on "

			"%s: %s (0x%x/%d)\n", QETH_CARD_IFNAME(card),

			qeth_l3_arp_get_error_cause(&rc), tmp, tmp);

	}

	return rc;
@@ -2260,9 +2245,6 @@ static int qeth_l3_arp_query_cb(struct qeth_card *card, 
			qdata->no_entries * uentry_size){

		QETH_DBF_TEXT_(TRACE, 4, "qaer3%i", -ENOMEM);

		cmd->hdr.return_code = -ENOMEM;

		PRINT_WARN("query ARP user space buffer is too small for "

			   "the returned number of ARP entries. "

			   "Aborting query!\n");

		goto out_error;

	}

	QETH_DBF_TEXT_(TRACE, 4, "anore%i",
@@ -2324,8 +2306,6 @@ static int qeth_l3_arp_query(struct qeth_card *card, char __user *udata) 


	if (!qeth_is_supported(card,/*IPA_QUERY_ARP_ADDR_INFO*/

			       IPA_ARP_PROCESSING)) {

		PRINT_WARN("ARP processing not supported "

			   "on %s!\n", QETH_CARD_IFNAME(card));

		return -EOPNOTSUPP;

	}

	/* get size of userspace buffer and mask_bits -> 6 bytes */
@@ -2344,7 +2324,7 @@ static int qeth_l3_arp_query(struct qeth_card *card, char __user *udata) 
				   qeth_l3_arp_query_cb, (void *)&qinfo);

	if (rc) {

		tmp = rc;

		PRINT_WARN("Error while querying ARP cache on %s: %s "

		QETH_DBF_MESSAGE(2, "Error while querying ARP cache on %s: %s "

			"(0x%x/%d)\n", QETH_CARD_IFNAME(card),

			qeth_l3_arp_get_error_cause(&rc), tmp, tmp);

		if (copy_to_user(udata, qinfo.udata, 4))
@@ -2375,8 +2355,6 @@ static int qeth_l3_arp_add_entry(struct qeth_card *card, 
	if (card->info.guestlan)

		return -EOPNOTSUPP;

	if (!qeth_is_supported(card, IPA_ARP_PROCESSING)) {

		PRINT_WARN("ARP processing not supported "

			   "on %s!\n", QETH_CARD_IFNAME(card));

		return -EOPNOTSUPP;

	}
@@ -2391,9 +2369,8 @@ static int qeth_l3_arp_add_entry(struct qeth_card *card, 
	if (rc) {

		tmp = rc;

		qeth_l3_ipaddr4_to_string((u8 *)entry->ipaddr, buf);

		PRINT_WARN("Could not add ARP entry for address %s on %s: "

			   "%s (0x%x/%d)\n",

			   buf, QETH_CARD_IFNAME(card),

		QETH_DBF_MESSAGE(2, "Could not add ARP entry for address %s "

			"on %s: %s (0x%x/%d)\n", buf, QETH_CARD_IFNAME(card),

			qeth_l3_arp_get_error_cause(&rc), tmp, tmp);

	}

	return rc;
@@ -2417,8 +2394,6 @@ static int qeth_l3_arp_remove_entry(struct qeth_card *card, 
	if (card->info.guestlan)

		return -EOPNOTSUPP;

	if (!qeth_is_supported(card, IPA_ARP_PROCESSING)) {

		PRINT_WARN("ARP processing not supported "

			   "on %s!\n", QETH_CARD_IFNAME(card));

		return -EOPNOTSUPP;

	}

	memcpy(buf, entry, 12);
@@ -2433,9 +2408,8 @@ static int qeth_l3_arp_remove_entry(struct qeth_card *card, 
		tmp = rc;

		memset(buf, 0, 16);

		qeth_l3_ipaddr4_to_string((u8 *)entry->ipaddr, buf);

		PRINT_WARN("Could not delete ARP entry for address %s on %s: "

			   "%s (0x%x/%d)\n",

			   buf, QETH_CARD_IFNAME(card),

		QETH_DBF_MESSAGE(2, "Could not delete ARP entry for address %s"

			" on %s: %s (0x%x/%d)\n", buf, QETH_CARD_IFNAME(card),

			qeth_l3_arp_get_error_cause(&rc), tmp, tmp);

	}

	return rc;
@@ -2456,16 +2430,14 @@ static int qeth_l3_arp_flush_cache(struct qeth_card *card) 
	if (card->info.guestlan || (card->info.type == QETH_CARD_TYPE_IQD))

		return -EOPNOTSUPP;

	if (!qeth_is_supported(card, IPA_ARP_PROCESSING)) {

		PRINT_WARN("ARP processing not supported "

			   "on %s!\n", QETH_CARD_IFNAME(card));

		return -EOPNOTSUPP;

	}

	rc = qeth_l3_send_simple_setassparms(card, IPA_ARP_PROCESSING,

					  IPA_CMD_ASS_ARP_FLUSH_CACHE, 0);

	if (rc) {

		tmp = rc;

		PRINT_WARN("Could not flush ARP cache on %s: %s (0x%x/%d)\n",

			QETH_CARD_IFNAME(card),

		QETH_DBF_MESSAGE(2, "Could not flush ARP cache on %s: %s "

			"(0x%x/%d)\n", QETH_CARD_IFNAME(card),

			qeth_l3_arp_get_error_cause(&rc), tmp, tmp);

	}

	return rc;
@@ -2724,7 +2696,7 @@ static int qeth_l3_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) 
		ctx = qeth_eddp_create_context(card, new_skb, hdr,

						skb->sk->sk_protocol);

		if (ctx == NULL) {

			PRINT_WARN("could not create eddp context\n");

			QETH_DBF_MESSAGE(2, "could not create eddp context\n");

			goto tx_drop;

		}

	} else {