Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

qeth: reduce number of kernel messages

Remove unnecessary messages. Write important debug information to
s390dbf.

Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

authored by

Frank Blaschka and committed by
Jeff Garzik
14cc21b6 f06f6f32

+42 -131
+7 -23
drivers/s390/net/qeth_core_main.c
··· 290 290 card->dev->features |= NETIF_F_TSO | NETIF_F_SG | 291 291 NETIF_F_HW_CSUM; 292 292 } else { 293 - PRINT_WARN("TSO not supported on %s. " 294 - "large_send set to 'no'.\n", 295 - card->dev->name); 296 293 card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG | 297 294 NETIF_F_HW_CSUM); 298 295 card->options.large_send = QETH_LARGE_SEND_NO; ··· 1430 1433 spin_unlock_irqrestore(get_ccwdev_lock(channel->ccwdev), flags); 1431 1434 1432 1435 if (rc) { 1433 - PRINT_ERR("Error2 in activating channel rc=%d\n", rc); 1436 + QETH_DBF_MESSAGE(2, "Error2 in activating channel rc=%d\n", rc); 1434 1437 QETH_DBF_TEXT_(SETUP, 2, "2err%d", rc); 1435 1438 atomic_set(&channel->irq_pending, 0); 1436 1439 wake_up(&card->wait_q); ··· 1500 1503 spin_unlock_irqrestore(get_ccwdev_lock(channel->ccwdev), flags); 1501 1504 1502 1505 if (rc) { 1503 - PRINT_ERR("Error1 in activating channel. rc=%d\n", rc); 1506 + QETH_DBF_MESSAGE(2, "Error1 in activating channel. rc=%d\n", 1507 + rc); 1504 1508 QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc); 1505 1509 atomic_set(&channel->irq_pending, 0); 1506 1510 wake_up(&card->wait_q); ··· 1651 1653 1652 1654 reply = qeth_alloc_reply(card); 1653 1655 if (!reply) { 1654 - PRINT_WARN("Could not alloc qeth_reply!\n"); 1655 1656 return -ENOMEM; 1656 1657 } 1657 1658 reply->callback = reply_cb; ··· 2604 2607 if (newcount < count) { 2605 2608 /* we are in memory shortage so we switch back to 2606 2609 traditional skb allocation and drop packages */ 2607 - if (!atomic_read(&card->force_alloc_skb) && 2608 - net_ratelimit()) 2609 - PRINT_WARN("Switch to alloc skb\n"); 2610 2610 atomic_set(&card->force_alloc_skb, 3); 2611 2611 count = newcount; 2612 2612 } else { 2613 - if ((atomic_read(&card->force_alloc_skb) == 1) && 2614 - net_ratelimit()) 2615 - PRINT_WARN("Switch to sg\n"); 2616 2613 atomic_add_unless(&card->force_alloc_skb, -1, 0); 2617 2614 } 2618 2615 ··· 3020 3029 elements_needed = 1 + (((((unsigned long) hdr) % PAGE_SIZE) 3021 3030 + skb->len) >> PAGE_SHIFT); 3022 3031 if ((elements_needed + elems) > QETH_MAX_BUFFER_ELEMENTS(card)) { 3023 - PRINT_ERR("Invalid size of IP packet " 3032 + QETH_DBF_MESSAGE(2, "Invalid size of IP packet " 3024 3033 "(Number=%d / Length=%d). Discarded.\n", 3025 3034 (elements_needed+elems), skb->len); 3026 3035 return 0; ··· 3233 3242 * free buffers) to handle eddp context */ 3234 3243 if (qeth_eddp_check_buffers_for_context(queue, ctx) 3235 3244 < 0) { 3236 - if (net_ratelimit()) 3237 - PRINT_WARN("eddp tx_dropped 1\n"); 3238 3245 rc = -EBUSY; 3239 3246 goto out; 3240 3247 } ··· 3244 3255 tmp = qeth_eddp_fill_buffer(queue, ctx, 3245 3256 queue->next_buf_to_fill); 3246 3257 if (tmp < 0) { 3247 - PRINT_ERR("eddp tx_dropped 2\n"); 3248 3258 rc = -EBUSY; 3249 3259 goto out; 3250 3260 } ··· 3585 3597 3586 3598 if ((!qeth_adp_supported(card, IPA_SETADP_SET_SNMP_CONTROL)) && 3587 3599 (!card->options.layer2)) { 3588 - PRINT_WARN("SNMP Query MIBS not supported " 3589 - "on %s!\n", QETH_CARD_IFNAME(card)); 3590 3600 return -EOPNOTSUPP; 3591 3601 } 3592 3602 /* skip 4 bytes (data_len struct member) to get req_len */ ··· 3615 3629 rc = qeth_send_ipa_snmp_cmd(card, iob, QETH_SETADP_BASE_LEN + req_len, 3616 3630 qeth_snmp_command_cb, (void *)&qinfo); 3617 3631 if (rc) 3618 - PRINT_WARN("SNMP command failed on %s: (0x%x)\n", 3632 + QETH_DBF_MESSAGE(2, "SNMP command failed on %s: (0x%x)\n", 3619 3633 QETH_CARD_IFNAME(card), rc); 3620 3634 else { 3621 3635 if (copy_to_user(udata, qinfo.udata, qinfo.udata_len)) ··· 3788 3802 if (mpno) 3789 3803 mpno = min(mpno - 1, QETH_MAX_PORTNO); 3790 3804 if (card->info.portno > mpno) { 3791 - PRINT_ERR("Device %s does not offer port number %d \n.", 3792 - CARD_BUS_ID(card), card->info.portno); 3805 + QETH_DBF_MESSAGE(2, "Device %s does not offer port number %d" 3806 + "\n.", CARD_BUS_ID(card), card->info.portno); 3793 3807 rc = -ENODEV; 3794 3808 goto out; 3795 3809 } ··· 3966 3980 return skb; 3967 3981 no_mem: 3968 3982 if (net_ratelimit()) { 3969 - PRINT_WARN("No memory for packet received on %s.\n", 3970 - QETH_CARD_IFNAME(card)); 3971 3983 QETH_DBF_TEXT(TRACE, 2, "noskbmem"); 3972 3984 QETH_DBF_TEXT_(TRACE, 2, "%s", CARD_BUS_ID(card)); 3973 3985 }
+2 -4
drivers/s390/net/qeth_core_offl.c
··· 122 122 if (element == 0) 123 123 return -EBUSY; 124 124 else { 125 - PRINT_WARN("could only partially fill eddp " 126 - "buffer!\n"); 125 + QETH_DBF_MESSAGE(2, "could only partially fill" 126 + "eddp buffer!\n"); 127 127 goto out; 128 128 } 129 129 } ··· 143 143 if (must_refcnt) { 144 144 must_refcnt = 0; 145 145 if (qeth_eddp_buf_ref_context(buf, ctx)) { 146 - PRINT_WARN("no memory to create eddp context " 147 - "reference\n"); 148 146 goto out_check; 149 147 } 150 148 }
-12
drivers/s390/net/qeth_core_sys.c
··· 129 129 130 130 portno = simple_strtoul(buf, &tmp, 16); 131 131 if (portno > QETH_MAX_PORTNO) { 132 - PRINT_WARN("portno 0x%X is out of range\n", portno); 133 132 return -EINVAL; 134 133 } 135 134 ··· 222 223 * if though we have to permit priority queueing 223 224 */ 224 225 if (card->qdio.no_out_queues == 1) { 225 - PRINT_WARN("Priority queueing disabled due " 226 - "to hardware limitations!\n"); 227 226 card->qdio.do_prio_queueing = QETH_PRIOQ_DEFAULT; 228 227 return -EPERM; 229 228 } ··· 247 250 card->qdio.do_prio_queueing = QETH_NO_PRIO_QUEUEING; 248 251 card->qdio.default_out_queue = QETH_DEFAULT_QUEUE; 249 252 } else { 250 - PRINT_WARN("Unknown queueing type '%s'\n", tmp); 251 253 return -EINVAL; 252 254 } 253 255 return count; ··· 287 291 ((cnt > QETH_IN_BUF_COUNT_MAX) ? QETH_IN_BUF_COUNT_MAX : cnt); 288 292 if (old_cnt != cnt) { 289 293 rc = qeth_realloc_buffer_pool(card, cnt); 290 - if (rc) 291 - PRINT_WARN("Error (%d) while setting " 292 - "buffer count.\n", rc); 293 294 } 294 295 return count; 295 296 } ··· 348 355 card->perf_stats.initial_rx_packets = card->stats.rx_packets; 349 356 card->perf_stats.initial_tx_packets = card->stats.tx_packets; 350 357 } else { 351 - PRINT_WARN("performance_stats: write 0 or 1 to this file!\n"); 352 358 return -EINVAL; 353 359 } 354 360 return count; ··· 391 399 newdis = QETH_DISCIPLINE_LAYER2; 392 400 break; 393 401 default: 394 - PRINT_WARN("layer2: write 0 or 1 to this file!\n"); 395 402 return -EINVAL; 396 403 } 397 404 ··· 454 463 } else if (!strcmp(tmp, "TSO")) { 455 464 type = QETH_LARGE_SEND_TSO; 456 465 } else { 457 - PRINT_WARN("large_send: invalid mode %s!\n", tmp); 458 466 return -EINVAL; 459 467 } 460 468 if (card->options.large_send == type) ··· 493 503 if (i <= max_value) { 494 504 *value = i; 495 505 } else { 496 - PRINT_WARN("blkt total time: write values between" 497 - " 0 and %d to this file!\n", max_value); 498 506 return -EINVAL; 499 507 } 500 508 return count;
+11 -18
drivers/s390/net/qeth_l2_main.c
··· 131 131 mac = &cmd->data.setdelmac.mac[0]; 132 132 /* MAC already registered, needed in couple/uncouple case */ 133 133 if (cmd->hdr.return_code == 0x2005) { 134 - PRINT_WARN("Group MAC %02x:%02x:%02x:%02x:%02x:%02x " \ 134 + QETH_DBF_MESSAGE(2, "Group MAC %02x:%02x:%02x:%02x:%02x:%02x " 135 135 "already existing on %s \n", 136 136 mac[0], mac[1], mac[2], mac[3], mac[4], mac[5], 137 137 QETH_CARD_IFNAME(card)); 138 138 cmd->hdr.return_code = 0; 139 139 } 140 140 if (cmd->hdr.return_code) 141 - PRINT_ERR("Could not set group MAC " \ 141 + QETH_DBF_MESSAGE(2, "Could not set group MAC " 142 142 "%02x:%02x:%02x:%02x:%02x:%02x on %s: %x\n", 143 143 mac[0], mac[1], mac[2], mac[3], mac[4], mac[5], 144 144 QETH_CARD_IFNAME(card), cmd->hdr.return_code); ··· 163 163 cmd = (struct qeth_ipa_cmd *) data; 164 164 mac = &cmd->data.setdelmac.mac[0]; 165 165 if (cmd->hdr.return_code) 166 - PRINT_ERR("Could not delete group MAC " \ 166 + QETH_DBF_MESSAGE(2, "Could not delete group MAC " 167 167 "%02x:%02x:%02x:%02x:%02x:%02x on %s: %x\n", 168 168 mac[0], mac[1], mac[2], mac[3], mac[4], mac[5], 169 169 QETH_CARD_IFNAME(card), cmd->hdr.return_code); ··· 183 183 184 184 mc = kmalloc(sizeof(struct qeth_mc_mac), GFP_ATOMIC); 185 185 186 - if (!mc) { 187 - PRINT_ERR("no mem vor mc mac address\n"); 186 + if (!mc) 188 187 return; 189 - } 190 188 191 189 memcpy(mc->mc_addr, mac, OSA_ADDR_LEN); 192 190 mc->mc_addrlen = OSA_ADDR_LEN; ··· 275 277 QETH_DBF_TEXT(TRACE, 2, "L2sdvcb"); 276 278 cmd = (struct qeth_ipa_cmd *) data; 277 279 if (cmd->hdr.return_code) { 278 - PRINT_ERR("Error in processing VLAN %i on %s: 0x%x. " 280 + QETH_DBF_MESSAGE(2, "Error in processing VLAN %i on %s: 0x%x. " 279 281 "Continuing\n", cmd->data.setdelvlan.vlan_id, 280 282 QETH_CARD_IFNAME(card), cmd->hdr.return_code); 281 283 QETH_DBF_TEXT_(TRACE, 2, "L2VL%4x", cmd->hdr.command); ··· 328 330 spin_lock_bh(&card->vlanlock); 329 331 list_add_tail(&id->list, &card->vid_list); 330 332 spin_unlock_bh(&card->vlanlock); 331 - } else { 332 - PRINT_ERR("no memory for vid\n"); 333 333 } 334 334 } 335 335 ··· 543 547 544 548 rc = qeth_query_setadapterparms(card); 545 549 if (rc) { 546 - PRINT_WARN("could not query adapter parameters on device %s: " 547 - "x%x\n", CARD_BUS_ID(card), rc); 550 + QETH_DBF_MESSAGE(2, "could not query adapter parameters on " 551 + "device %s: x%x\n", CARD_BUS_ID(card), rc); 548 552 } 549 553 550 554 if (card->info.guestlan) { 551 555 rc = qeth_setadpparms_change_macaddr(card); 552 556 if (rc) { 553 - PRINT_WARN("couldn't get MAC address on " 554 - "device %s: x%x\n", 555 - CARD_BUS_ID(card), rc); 557 + QETH_DBF_MESSAGE(2, "couldn't get MAC address on " 558 + "device %s: x%x\n", CARD_BUS_ID(card), rc); 556 559 QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc); 557 560 return rc; 558 561 } ··· 577 582 } 578 583 579 584 if (card->info.type == QETH_CARD_TYPE_OSN) { 580 - PRINT_WARN("Setting MAC address on %s is not supported.\n", 581 - dev->name); 582 585 QETH_DBF_TEXT(TRACE, 3, "setmcOSN"); 583 586 return -EOPNOTSUPP; 584 587 } ··· 656 663 ctx = qeth_eddp_create_context(card, new_skb, hdr, 657 664 skb->sk->sk_protocol); 658 665 if (ctx == NULL) { 659 - PRINT_WARN("could not create eddp context\n"); 666 + QETH_DBF_MESSAGE(2, "could not create eddp context\n"); 660 667 goto tx_drop; 661 668 } 662 669 } else { ··· 1145 1152 (addr_t) iob, 0, 0); 1146 1153 spin_unlock_irqrestore(get_ccwdev_lock(card->write.ccwdev), flags); 1147 1154 if (rc) { 1148 - PRINT_WARN("qeth_osn_send_control_data: " 1155 + QETH_DBF_MESSAGE(2, "qeth_osn_send_control_data: " 1149 1156 "ccw_device_start rc = %i\n", rc); 1150 1157 QETH_DBF_TEXT_(TRACE, 2, " err%d", rc); 1151 1158 qeth_release_buffer(iob->channel, iob);
+22 -50
drivers/s390/net/qeth_l3_main.c
··· 311 311 312 312 addr = kzalloc(sizeof(struct qeth_ipaddr), GFP_ATOMIC); 313 313 if (addr == NULL) { 314 - PRINT_WARN("Not enough memory to add address\n"); 315 314 return NULL; 316 315 } 317 316 addr->type = QETH_IP_TYPE_NORMAL; ··· 648 649 } 649 650 } 650 651 out_inval: 651 - PRINT_WARN("Routing type '%s' not supported for interface %s.\n" 652 - "Router status set to 'no router'.\n", 653 - ((*type == PRIMARY_ROUTER)? "primary router" : 654 - (*type == SECONDARY_ROUTER)? "secondary router" : 655 - (*type == PRIMARY_CONNECTOR)? "primary connector" : 656 - (*type == SECONDARY_CONNECTOR)? "secondary connector" : 657 - (*type == MULTICAST_ROUTER)? "multicast router" : 658 - "unknown"), 659 - card->dev->name); 660 652 *type = NO_ROUTER; 661 653 } 662 654 ··· 664 674 QETH_PROT_IPV4); 665 675 if (rc) { 666 676 card->options.route4.type = NO_ROUTER; 667 - PRINT_WARN("Error (0x%04x) while setting routing type on %s. " 668 - "Type set to 'no router'.\n", 669 - rc, QETH_CARD_IFNAME(card)); 677 + QETH_DBF_MESSAGE(2, "Error (0x%04x) while setting routing type" 678 + " on %s. Type set to 'no router'.\n", rc, 679 + QETH_CARD_IFNAME(card)); 670 680 } 671 681 return rc; 672 682 } ··· 687 697 QETH_PROT_IPV6); 688 698 if (rc) { 689 699 card->options.route6.type = NO_ROUTER; 690 - PRINT_WARN("Error (0x%04x) while setting routing type on %s. " 691 - "Type set to 'no router'.\n", 692 - rc, QETH_CARD_IFNAME(card)); 700 + QETH_DBF_MESSAGE(2, "Error (0x%04x) while setting routing type" 701 + " on %s. Type set to 'no router'.\n", rc, 702 + QETH_CARD_IFNAME(card)); 693 703 } 694 704 #endif 695 705 return rc; ··· 727 737 if (!memcmp(ipatoe->addr, new->addr, 728 738 (ipatoe->proto == QETH_PROT_IPV4)? 4:16) && 729 739 (ipatoe->mask_bits == new->mask_bits)) { 730 - PRINT_WARN("ipato entry already exists!\n"); 731 740 rc = -EEXIST; 732 741 break; 733 742 } ··· 791 802 rc = -EEXIST; 792 803 spin_unlock_irqrestore(&card->ip_lock, flags); 793 804 if (rc) { 794 - PRINT_WARN("Cannot add VIPA. Address already exists!\n"); 795 805 return rc; 796 806 } 797 807 if (!qeth_l3_add_ip(card, ipaddr)) ··· 855 867 rc = -EEXIST; 856 868 spin_unlock_irqrestore(&card->ip_lock, flags); 857 869 if (rc) { 858 - PRINT_WARN("Cannot add RXIP. Address already exists!\n"); 859 870 return rc; 860 871 } 861 872 if (!qeth_l3_add_ip(card, ipaddr)) ··· 1007 1020 IPA_SETADP_SET_BROADCAST_MODE, 1008 1021 card->options.broadcast_mode); 1009 1022 if (rc) 1010 - PRINT_WARN("couldn't set broadcast mode on " 1023 + QETH_DBF_MESSAGE(2, "couldn't set broadcast mode on " 1011 1024 "device %s: x%x\n", 1012 1025 CARD_BUS_ID(card), rc); 1013 1026 rc = qeth_l3_send_setadp_mode(card, 1014 1027 IPA_SETADP_ALTER_MAC_ADDRESS, 1015 1028 card->options.macaddr_mode); 1016 1029 if (rc) 1017 - PRINT_WARN("couldn't set macaddr mode on " 1030 + QETH_DBF_MESSAGE(2, "couldn't set macaddr mode on " 1018 1031 "device %s: x%x\n", CARD_BUS_ID(card), rc); 1019 1032 return rc; 1020 1033 } 1021 1034 if (card->options.broadcast_mode == QETH_TR_BROADCAST_LOCAL) 1022 - PRINT_WARN("set adapter parameters not available " 1035 + QETH_DBF_MESSAGE(2, "set adapter parameters not available " 1023 1036 "to set broadcast mode, using ALLRINGS " 1024 1037 "on device %s:\n", CARD_BUS_ID(card)); 1025 1038 if (card->options.macaddr_mode == QETH_TR_MACADDR_CANONICAL) 1026 - PRINT_WARN("set adapter parameters not available " 1039 + QETH_DBF_MESSAGE(2, "set adapter parameters not available " 1027 1040 "to set macaddr mode, using NONCANONICAL " 1028 1041 "on device %s:\n", CARD_BUS_ID(card)); 1029 1042 return 0; ··· 2169 2182 if (card->info.guestlan) 2170 2183 return -EOPNOTSUPP; 2171 2184 if (!qeth_is_supported(card, IPA_ARP_PROCESSING)) { 2172 - PRINT_WARN("ARP processing not supported " 2173 - "on %s!\n", QETH_CARD_IFNAME(card)); 2174 2185 return -EOPNOTSUPP; 2175 2186 } 2176 2187 rc = qeth_l3_send_simple_setassparms(card, IPA_ARP_PROCESSING, ··· 2176 2191 no_entries); 2177 2192 if (rc) { 2178 2193 tmp = rc; 2179 - PRINT_WARN("Could not set number of ARP entries on %s: " 2180 - "%s (0x%x/%d)\n", QETH_CARD_IFNAME(card), 2194 + QETH_DBF_MESSAGE(2, "Could not set number of ARP entries on " 2195 + "%s: %s (0x%x/%d)\n", QETH_CARD_IFNAME(card), 2181 2196 qeth_l3_arp_get_error_cause(&rc), tmp, tmp); 2182 2197 } 2183 2198 return rc; ··· 2245 2260 qdata->no_entries * uentry_size){ 2246 2261 QETH_DBF_TEXT_(TRACE, 4, "qaer3%i", -ENOMEM); 2247 2262 cmd->hdr.return_code = -ENOMEM; 2248 - PRINT_WARN("query ARP user space buffer is too small for " 2249 - "the returned number of ARP entries. " 2250 - "Aborting query!\n"); 2251 2263 goto out_error; 2252 2264 } 2253 2265 QETH_DBF_TEXT_(TRACE, 4, "anore%i", ··· 2306 2324 2307 2325 if (!qeth_is_supported(card,/*IPA_QUERY_ARP_ADDR_INFO*/ 2308 2326 IPA_ARP_PROCESSING)) { 2309 - PRINT_WARN("ARP processing not supported " 2310 - "on %s!\n", QETH_CARD_IFNAME(card)); 2311 2327 return -EOPNOTSUPP; 2312 2328 } 2313 2329 /* get size of userspace buffer and mask_bits -> 6 bytes */ ··· 2324 2344 qeth_l3_arp_query_cb, (void *)&qinfo); 2325 2345 if (rc) { 2326 2346 tmp = rc; 2327 - PRINT_WARN("Error while querying ARP cache on %s: %s " 2347 + QETH_DBF_MESSAGE(2, "Error while querying ARP cache on %s: %s " 2328 2348 "(0x%x/%d)\n", QETH_CARD_IFNAME(card), 2329 2349 qeth_l3_arp_get_error_cause(&rc), tmp, tmp); 2330 2350 if (copy_to_user(udata, qinfo.udata, 4)) ··· 2355 2375 if (card->info.guestlan) 2356 2376 return -EOPNOTSUPP; 2357 2377 if (!qeth_is_supported(card, IPA_ARP_PROCESSING)) { 2358 - PRINT_WARN("ARP processing not supported " 2359 - "on %s!\n", QETH_CARD_IFNAME(card)); 2360 2378 return -EOPNOTSUPP; 2361 2379 } 2362 2380 ··· 2369 2391 if (rc) { 2370 2392 tmp = rc; 2371 2393 qeth_l3_ipaddr4_to_string((u8 *)entry->ipaddr, buf); 2372 - PRINT_WARN("Could not add ARP entry for address %s on %s: " 2373 - "%s (0x%x/%d)\n", 2374 - buf, QETH_CARD_IFNAME(card), 2375 - qeth_l3_arp_get_error_cause(&rc), tmp, tmp); 2394 + QETH_DBF_MESSAGE(2, "Could not add ARP entry for address %s " 2395 + "on %s: %s (0x%x/%d)\n", buf, QETH_CARD_IFNAME(card), 2396 + qeth_l3_arp_get_error_cause(&rc), tmp, tmp); 2376 2397 } 2377 2398 return rc; 2378 2399 } ··· 2394 2417 if (card->info.guestlan) 2395 2418 return -EOPNOTSUPP; 2396 2419 if (!qeth_is_supported(card, IPA_ARP_PROCESSING)) { 2397 - PRINT_WARN("ARP processing not supported " 2398 - "on %s!\n", QETH_CARD_IFNAME(card)); 2399 2420 return -EOPNOTSUPP; 2400 2421 } 2401 2422 memcpy(buf, entry, 12); ··· 2408 2433 tmp = rc; 2409 2434 memset(buf, 0, 16); 2410 2435 qeth_l3_ipaddr4_to_string((u8 *)entry->ipaddr, buf); 2411 - PRINT_WARN("Could not delete ARP entry for address %s on %s: " 2412 - "%s (0x%x/%d)\n", 2413 - buf, QETH_CARD_IFNAME(card), 2414 - qeth_l3_arp_get_error_cause(&rc), tmp, tmp); 2436 + QETH_DBF_MESSAGE(2, "Could not delete ARP entry for address %s" 2437 + " on %s: %s (0x%x/%d)\n", buf, QETH_CARD_IFNAME(card), 2438 + qeth_l3_arp_get_error_cause(&rc), tmp, tmp); 2415 2439 } 2416 2440 return rc; 2417 2441 } ··· 2430 2456 if (card->info.guestlan || (card->info.type == QETH_CARD_TYPE_IQD)) 2431 2457 return -EOPNOTSUPP; 2432 2458 if (!qeth_is_supported(card, IPA_ARP_PROCESSING)) { 2433 - PRINT_WARN("ARP processing not supported " 2434 - "on %s!\n", QETH_CARD_IFNAME(card)); 2435 2459 return -EOPNOTSUPP; 2436 2460 } 2437 2461 rc = qeth_l3_send_simple_setassparms(card, IPA_ARP_PROCESSING, 2438 2462 IPA_CMD_ASS_ARP_FLUSH_CACHE, 0); 2439 2463 if (rc) { 2440 2464 tmp = rc; 2441 - PRINT_WARN("Could not flush ARP cache on %s: %s (0x%x/%d)\n", 2442 - QETH_CARD_IFNAME(card), 2465 + QETH_DBF_MESSAGE(2, "Could not flush ARP cache on %s: %s " 2466 + "(0x%x/%d)\n", QETH_CARD_IFNAME(card), 2443 2467 qeth_l3_arp_get_error_cause(&rc), tmp, tmp); 2444 2468 } 2445 2469 return rc; ··· 2696 2724 ctx = qeth_eddp_create_context(card, new_skb, hdr, 2697 2725 skb->sk->sk_protocol); 2698 2726 if (ctx == NULL) { 2699 - PRINT_WARN("could not create eddp context\n"); 2727 + QETH_DBF_MESSAGE(2, "could not create eddp context\n"); 2700 2728 goto tx_drop; 2701 2729 } 2702 2730 } else {
-24
drivers/s390/net/qeth_l3_sys.c
··· 85 85 } else if (!strcmp(tmp, "multicast_router")) { 86 86 route->type = MULTICAST_ROUTER; 87 87 } else { 88 - PRINT_WARN("Invalid routing type '%s'.\n", tmp); 89 88 return -EINVAL; 90 89 } 91 90 if (((card->state == CARD_STATE_SOFTSETUP) || ··· 136 137 return -EINVAL; 137 138 138 139 if (!qeth_is_supported(card, IPA_IPV6)) { 139 - PRINT_WARN("IPv6 not supported for interface %s.\n" 140 - "Routing status no changed.\n", 141 - QETH_CARD_IFNAME(card)); 142 140 return -ENOTSUPP; 143 141 } 144 142 ··· 175 179 if ((i == 0) || (i == 1)) 176 180 card->options.fake_broadcast = i; 177 181 else { 178 - PRINT_WARN("fake_broadcast: write 0 or 1 to this file!\n"); 179 182 return -EINVAL; 180 183 } 181 184 return count; ··· 215 220 216 221 if (!((card->info.link_type == QETH_LINK_TYPE_HSTR) || 217 222 (card->info.link_type == QETH_LINK_TYPE_LANE_TR))) { 218 - PRINT_WARN("Device is not a tokenring device!\n"); 219 223 return -EINVAL; 220 224 } 221 225 ··· 227 233 card->options.broadcast_mode = QETH_TR_BROADCAST_ALLRINGS; 228 234 return count; 229 235 } else { 230 - PRINT_WARN("broadcast_mode: invalid mode %s!\n", 231 - tmp); 232 236 return -EINVAL; 233 237 } 234 238 return count; ··· 267 275 268 276 if (!((card->info.link_type == QETH_LINK_TYPE_HSTR) || 269 277 (card->info.link_type == QETH_LINK_TYPE_LANE_TR))) { 270 - PRINT_WARN("Device is not a tokenring device!\n"); 271 278 return -EINVAL; 272 279 } 273 280 ··· 276 285 QETH_TR_MACADDR_CANONICAL : 277 286 QETH_TR_MACADDR_NONCANONICAL; 278 287 else { 279 - PRINT_WARN("canonical_macaddr: write 0 or 1 to this file!\n"); 280 288 return -EINVAL; 281 289 } 282 290 return count; ··· 317 327 else if (!strcmp(tmp, "no_checksumming")) 318 328 card->options.checksum_type = NO_CHECKSUMMING; 319 329 else { 320 - PRINT_WARN("Unknown checksumming type '%s'\n", tmp); 321 330 return -EINVAL; 322 331 } 323 332 return count; ··· 371 382 } else if (!strcmp(tmp, "0")) { 372 383 card->ipato.enabled = 0; 373 384 } else { 374 - PRINT_WARN("ipato_enable: write 0, 1 or 'toggle' to " 375 - "this file\n"); 376 385 return -EINVAL; 377 386 } 378 387 return count; ··· 409 422 } else if (!strcmp(tmp, "0")) { 410 423 card->ipato.invert4 = 0; 411 424 } else { 412 - PRINT_WARN("ipato_invert4: write 0, 1 or 'toggle' to " 413 - "this file\n"); 414 425 return -EINVAL; 415 426 } 416 427 return count; ··· 471 486 /* get address string */ 472 487 end = strchr(start, '/'); 473 488 if (!end || (end - start >= 40)) { 474 - PRINT_WARN("Invalid format for ipato_addx/delx. " 475 - "Use <ip addr>/<mask bits>\n"); 476 489 return -EINVAL; 477 490 } 478 491 strncpy(buffer, start, end - start); 479 492 if (qeth_l3_string_to_ipaddr(buffer, proto, addr)) { 480 - PRINT_WARN("Invalid IP address format!\n"); 481 493 return -EINVAL; 482 494 } 483 495 start = end + 1; ··· 482 500 if (!strlen(start) || 483 501 (tmp == start) || 484 502 (*mask_bits > ((proto == QETH_PROT_IPV4) ? 32 : 128))) { 485 - PRINT_WARN("Invalid mask bits for ipato_addx/delx !\n"); 486 503 return -EINVAL; 487 504 } 488 505 return 0; ··· 501 520 502 521 ipatoe = kzalloc(sizeof(struct qeth_ipato_entry), GFP_KERNEL); 503 522 if (!ipatoe) { 504 - PRINT_WARN("No memory to allocate ipato entry\n"); 505 523 return -ENOMEM; 506 524 } 507 525 ipatoe->proto = proto; ··· 589 609 } else if (!strcmp(tmp, "0")) { 590 610 card->ipato.invert6 = 0; 591 611 } else { 592 - PRINT_WARN("ipato_invert6: write 0, 1 or 'toggle' to " 593 - "this file\n"); 594 612 return -EINVAL; 595 613 } 596 614 return count; ··· 702 724 u8 *addr) 703 725 { 704 726 if (qeth_l3_string_to_ipaddr(buf, proto, addr)) { 705 - PRINT_WARN("Invalid IP address format!\n"); 706 727 return -EINVAL; 707 728 } 708 729 return 0; ··· 868 891 u8 *addr) 869 892 { 870 893 if (qeth_l3_string_to_ipaddr(buf, proto, addr)) { 871 - PRINT_WARN("Invalid IP address format!\n"); 872 894 return -EINVAL; 873 895 } 874 896 return 0;