aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd L. Cashin <ecashin@coraid.com>2006-09-20 14:36:49 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2006-10-18 15:53:50 -0400
commit6bb6285fdb948cedee586c6bebc9ebc5e32a5c35 (patch)
tree775bff808343ef52d1b254a9e33144f13a197a45
parent19bf26353c50bc2be375109ec73f2f0bbd616ed1 (diff)
aoe: clean up printks via macros
Use simple macros to clean up the printks. (This patch is reverted by the 14th patch to follow.) Signed-off-by: "Ed L. Cashin" <ecashin@coraid.com> Acked-by: Alan Cox <alan@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/block/aoe/aoe.h5
-rw-r--r--drivers/block/aoe/aoeblk.c16
-rw-r--r--drivers/block/aoe/aoechr.c13
-rw-r--r--drivers/block/aoe/aoecmd.c57
-rw-r--r--drivers/block/aoe/aoedev.c2
-rw-r--r--drivers/block/aoe/aoemain.c8
-rw-r--r--drivers/block/aoe/aoenet.c7
7 files changed, 50 insertions, 58 deletions
diff --git a/drivers/block/aoe/aoe.h b/drivers/block/aoe/aoe.h
index 1cec19986c40..4d79f1eaf708 100644
--- a/drivers/block/aoe/aoe.h
+++ b/drivers/block/aoe/aoe.h
@@ -10,6 +10,11 @@
10#define AOE_PARTITIONS (16) 10#define AOE_PARTITIONS (16)
11#endif 11#endif
12 12
13#define xprintk(L, fmt, arg...) printk(L "aoe: " "%s: " fmt, __func__, ## arg)
14#define iprintk(fmt, arg...) xprintk(KERN_INFO, fmt, ## arg)
15#define eprintk(fmt, arg...) xprintk(KERN_ERR, fmt, ## arg)
16#define dprintk(fmt, arg...) xprintk(KERN_DEBUG, fmt, ## arg)
17
13#define SYSMINOR(aoemajor, aoeminor) ((aoemajor) * NPERSHELF + (aoeminor)) 18#define SYSMINOR(aoemajor, aoeminor) ((aoemajor) * NPERSHELF + (aoeminor))
14#define AOEMAJOR(sysminor) ((sysminor) / NPERSHELF) 19#define AOEMAJOR(sysminor) ((sysminor) / NPERSHELF)
15#define AOEMINOR(sysminor) ((sysminor) % NPERSHELF) 20#define AOEMINOR(sysminor) ((sysminor) % NPERSHELF)
diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index fa0e8cae6100..a7dbe6f53c14 100644
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -132,8 +132,7 @@ aoeblk_make_request(request_queue_t *q, struct bio *bio)
132 d = bio->bi_bdev->bd_disk->private_data; 132 d = bio->bi_bdev->bd_disk->private_data;
133 buf = mempool_alloc(d->bufpool, GFP_NOIO); 133 buf = mempool_alloc(d->bufpool, GFP_NOIO);
134 if (buf == NULL) { 134 if (buf == NULL) {
135 printk(KERN_INFO "aoe: aoeblk_make_request: buf allocation " 135 iprintk("buf allocation failure\n");
136 "failure\n");
137 bio_endio(bio, bio->bi_size, -ENOMEM); 136 bio_endio(bio, bio->bi_size, -ENOMEM);
138 return 0; 137 return 0;
139 } 138 }
@@ -150,8 +149,7 @@ aoeblk_make_request(request_queue_t *q, struct bio *bio)
150 spin_lock_irqsave(&d->lock, flags); 149 spin_lock_irqsave(&d->lock, flags);
151 150
152 if ((d->flags & DEVFL_UP) == 0) { 151 if ((d->flags & DEVFL_UP) == 0) {
153 printk(KERN_INFO "aoe: aoeblk_make_request: device %ld.%ld is not up\n", 152 iprintk("device %ld.%ld is not up\n", d->aoemajor, d->aoeminor);
154 d->aoemajor, d->aoeminor);
155 spin_unlock_irqrestore(&d->lock, flags); 153 spin_unlock_irqrestore(&d->lock, flags);
156 mempool_free(buf, d->bufpool); 154 mempool_free(buf, d->bufpool);
157 bio_endio(bio, bio->bi_size, -ENXIO); 155 bio_endio(bio, bio->bi_size, -ENXIO);
@@ -176,7 +174,7 @@ aoeblk_getgeo(struct block_device *bdev, struct hd_geometry *geo)
176 struct aoedev *d = bdev->bd_disk->private_data; 174 struct aoedev *d = bdev->bd_disk->private_data;
177 175
178 if ((d->flags & DEVFL_UP) == 0) { 176 if ((d->flags & DEVFL_UP) == 0) {
179 printk(KERN_ERR "aoe: aoeblk_ioctl: disk not up\n"); 177 eprintk("disk not up\n");
180 return -ENODEV; 178 return -ENODEV;
181 } 179 }
182 180
@@ -203,8 +201,8 @@ aoeblk_gdalloc(void *vp)
203 201
204 gd = alloc_disk(AOE_PARTITIONS); 202 gd = alloc_disk(AOE_PARTITIONS);
205 if (gd == NULL) { 203 if (gd == NULL) {
206 printk(KERN_ERR "aoe: aoeblk_gdalloc: cannot allocate disk " 204 eprintk("cannot allocate disk structure for %ld.%ld\n",
207 "structure for %ld.%ld\n", d->aoemajor, d->aoeminor); 205 d->aoemajor, d->aoeminor);
208 spin_lock_irqsave(&d->lock, flags); 206 spin_lock_irqsave(&d->lock, flags);
209 d->flags &= ~DEVFL_GDALLOC; 207 d->flags &= ~DEVFL_GDALLOC;
210 spin_unlock_irqrestore(&d->lock, flags); 208 spin_unlock_irqrestore(&d->lock, flags);
@@ -213,8 +211,8 @@ aoeblk_gdalloc(void *vp)
213 211
214 d->bufpool = mempool_create_slab_pool(MIN_BUFS, buf_pool_cache); 212 d->bufpool = mempool_create_slab_pool(MIN_BUFS, buf_pool_cache);
215 if (d->bufpool == NULL) { 213 if (d->bufpool == NULL) {
216 printk(KERN_ERR "aoe: aoeblk_gdalloc: cannot allocate bufpool " 214 eprintk("cannot allocate bufpool for %ld.%ld\n",
217 "for %ld.%ld\n", d->aoemajor, d->aoeminor); 215 d->aoemajor, d->aoeminor);
218 put_disk(gd); 216 put_disk(gd);
219 spin_lock_irqsave(&d->lock, flags); 217 spin_lock_irqsave(&d->lock, flags);
220 d->flags &= ~DEVFL_GDALLOC; 218 d->flags &= ~DEVFL_GDALLOC;
diff --git a/drivers/block/aoe/aoechr.c b/drivers/block/aoe/aoechr.c
index 2b5256cc733d..f5cab69fbc91 100644
--- a/drivers/block/aoe/aoechr.c
+++ b/drivers/block/aoe/aoechr.c
@@ -55,9 +55,7 @@ static int
55interfaces(const char __user *str, size_t size) 55interfaces(const char __user *str, size_t size)
56{ 56{
57 if (set_aoe_iflist(str, size)) { 57 if (set_aoe_iflist(str, size)) {
58 printk(KERN_CRIT 58 eprintk("could not set interface list: too many interfaces\n");
59 "%s: could not set interface list: %s\n",
60 __FUNCTION__, "too many interfaces");
61 return -EINVAL; 59 return -EINVAL;
62 } 60 }
63 return 0; 61 return 0;
@@ -80,8 +78,7 @@ revalidate(const char __user *str, size_t size)
80 /* should be e%d.%d format */ 78 /* should be e%d.%d format */
81 n = sscanf(buf, "e%d.%d", &major, &minor); 79 n = sscanf(buf, "e%d.%d", &major, &minor);
82 if (n != 2) { 80 if (n != 2) {
83 printk(KERN_ERR "aoe: %s: invalid device specification\n", 81 eprintk("invalid device specification\n");
84 __FUNCTION__);
85 return -EINVAL; 82 return -EINVAL;
86 } 83 }
87 d = aoedev_by_aoeaddr(major, minor); 84 d = aoedev_by_aoeaddr(major, minor);
@@ -116,7 +113,7 @@ bail: spin_unlock_irqrestore(&emsgs_lock, flags);
116 113
117 mp = kmalloc(n, GFP_ATOMIC); 114 mp = kmalloc(n, GFP_ATOMIC);
118 if (mp == NULL) { 115 if (mp == NULL) {
119 printk(KERN_CRIT "aoe: aoechr_error: allocation failure, len=%ld\n", n); 116 eprintk("allocation failure, len=%ld\n", n);
120 goto bail; 117 goto bail;
121 } 118 }
122 119
@@ -141,7 +138,7 @@ aoechr_write(struct file *filp, const char __user *buf, size_t cnt, loff_t *offp
141 138
142 switch ((unsigned long) filp->private_data) { 139 switch ((unsigned long) filp->private_data) {
143 default: 140 default:
144 printk(KERN_INFO "aoe: aoechr_write: can't write to that file.\n"); 141 iprintk("can't write to that file.\n");
145 break; 142 break;
146 case MINOR_DISCOVER: 143 case MINOR_DISCOVER:
147 ret = discover(); 144 ret = discover();
@@ -250,7 +247,7 @@ aoechr_init(void)
250 247
251 n = register_chrdev(AOE_MAJOR, "aoechr", &aoe_fops); 248 n = register_chrdev(AOE_MAJOR, "aoechr", &aoe_fops);
252 if (n < 0) { 249 if (n < 0) {
253 printk(KERN_ERR "aoe: aoechr_init: can't register char device\n"); 250 eprintk("can't register char device\n");
254 return n; 251 return n;
255 } 252 }
256 sema_init(&emsgs_sema, 0); 253 sema_init(&emsgs_sema, 0);
diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index 666797d646d6..63c456082d81 100644
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -155,7 +155,7 @@ aoecmd_ata_rw(struct aoedev *d, struct frame *f)
155 buf->nframesout += 1; 155 buf->nframesout += 1;
156 buf->bufaddr += bcnt; 156 buf->bufaddr += bcnt;
157 buf->bv_resid -= bcnt; 157 buf->bv_resid -= bcnt;
158/* printk(KERN_INFO "aoe: bv_resid=%ld\n", buf->bv_resid); */ 158/* dprintk("bv_resid=%ld\n", buf->bv_resid); */
159 buf->resid -= bcnt; 159 buf->resid -= bcnt;
160 buf->sector += bcnt >> 9; 160 buf->sector += bcnt >> 9;
161 if (buf->resid == 0) { 161 if (buf->resid == 0) {
@@ -197,7 +197,7 @@ aoecmd_cfg_pkts(ushort aoemajor, unsigned char aoeminor, struct sk_buff **tail)
197 197
198 skb = new_skb(sizeof *h + sizeof *ch); 198 skb = new_skb(sizeof *h + sizeof *ch);
199 if (skb == NULL) { 199 if (skb == NULL) {
200 printk(KERN_INFO "aoe: aoecmd_cfg: skb alloc failure\n"); 200 iprintk("skb alloc failure\n");
201 continue; 201 continue;
202 } 202 }
203 skb->dev = ifp; 203 skb->dev = ifp;
@@ -247,7 +247,7 @@ loop:
247 return; 247 return;
248 buf = container_of(d->bufq.next, struct buf, bufs); 248 buf = container_of(d->bufq.next, struct buf, bufs);
249 list_del(d->bufq.next); 249 list_del(d->bufq.next);
250/*printk(KERN_INFO "aoecmd_work: bi_size=%ld\n", buf->bio->bi_size); */ 250/*dprintk("bi_size=%ld\n", buf->bio->bi_size); */
251 d->inprocess = buf; 251 d->inprocess = buf;
252 } 252 }
253 aoecmd_ata_rw(d, f); 253 aoecmd_ata_rw(d, f);
@@ -287,8 +287,7 @@ rexmit(struct aoedev *d, struct frame *f)
287 offset_in_page(f->bufaddr), DEFAULTBCNT); 287 offset_in_page(f->bufaddr), DEFAULTBCNT);
288 if (++d->lostjumbo > (d->nframes << 1)) 288 if (++d->lostjumbo > (d->nframes << 1))
289 if (d->maxbcnt != DEFAULTBCNT) { 289 if (d->maxbcnt != DEFAULTBCNT) {
290 printk(KERN_INFO "aoe: rexmit: too many lost jumbo. " 290 iprintk("too many lost jumbo - using 1KB frames.\n");
291 "dropping back to 1KB frames.\n");
292 d->maxbcnt = DEFAULTBCNT; 291 d->maxbcnt = DEFAULTBCNT;
293 d->flags |= DEVFL_MAXBCNT; 292 d->flags |= DEVFL_MAXBCNT;
294 } 293 }
@@ -435,8 +434,8 @@ ataid_complete(struct aoedev *d, unsigned char *id)
435 } 434 }
436 435
437 if (d->ssize != ssize) 436 if (d->ssize != ssize)
438 printk(KERN_INFO "aoe: %012llx e%lu.%lu v%04x has %llu " 437 iprintk("%012llx e%lu.%lu v%04x has %llu sectors\n",
439 "sectors\n", (unsigned long long)mac_addr(d->addr), 438 (unsigned long long)mac_addr(d->addr),
440 d->aoemajor, d->aoeminor, 439 d->aoemajor, d->aoeminor,
441 d->fw_ver, (long long)ssize); 440 d->fw_ver, (long long)ssize);
442 d->ssize = ssize; 441 d->ssize = ssize;
@@ -446,11 +445,9 @@ ataid_complete(struct aoedev *d, unsigned char *id)
446 d->flags |= DEVFL_NEWSIZE; 445 d->flags |= DEVFL_NEWSIZE;
447 } else { 446 } else {
448 if (d->flags & DEVFL_GDALLOC) { 447 if (d->flags & DEVFL_GDALLOC) {
449 printk(KERN_INFO "aoe: %s: %s e%lu.%lu, %s\n", 448 eprintk("can't schedule work for e%lu.%lu, %s\n",
450 __FUNCTION__,
451 "can't schedule work for",
452 d->aoemajor, d->aoeminor, 449 d->aoemajor, d->aoeminor,
453 "it's already on! (This really shouldn't happen).\n"); 450 "it's already on! This shouldn't happen.\n");
454 return; 451 return;
455 } 452 }
456 d->flags |= DEVFL_GDALLOC; 453 d->flags |= DEVFL_GDALLOC;
@@ -524,8 +521,7 @@ aoecmd_ata_rsp(struct sk_buff *skb)
524 if (ahout->cmdstat == WIN_IDENTIFY) 521 if (ahout->cmdstat == WIN_IDENTIFY)
525 d->flags &= ~DEVFL_PAUSE; 522 d->flags &= ~DEVFL_PAUSE;
526 if (ahin->cmdstat & 0xa9) { /* these bits cleared on success */ 523 if (ahin->cmdstat & 0xa9) { /* these bits cleared on success */
527 printk(KERN_CRIT "aoe: aoecmd_ata_rsp: ata error cmd=%2.2Xh " 524 eprintk("ata error cmd=%2.2Xh stat=%2.2Xh from e%ld.%ld\n",
528 "stat=%2.2Xh from e%ld.%ld\n",
529 ahout->cmdstat, ahin->cmdstat, 525 ahout->cmdstat, ahin->cmdstat,
530 d->aoemajor, d->aoeminor); 526 d->aoemajor, d->aoeminor);
531 if (buf) 527 if (buf)
@@ -536,8 +532,7 @@ aoecmd_ata_rsp(struct sk_buff *skb)
536 case WIN_READ: 532 case WIN_READ:
537 case WIN_READ_EXT: 533 case WIN_READ_EXT:
538 if (skb->len - sizeof *hin - sizeof *ahin < n) { 534 if (skb->len - sizeof *hin - sizeof *ahin < n) {
539 printk(KERN_CRIT "aoe: aoecmd_ata_rsp: runt " 535 eprintk("runt data size in read. skb->len=%d\n",
540 "ata data size in read. skb->len=%d\n",
541 skb->len); 536 skb->len);
542 /* fail frame f? just returning will rexmit. */ 537 /* fail frame f? just returning will rexmit. */
543 spin_unlock_irqrestore(&d->lock, flags); 538 spin_unlock_irqrestore(&d->lock, flags);
@@ -549,10 +544,13 @@ aoecmd_ata_rsp(struct sk_buff *skb)
549 if (f->bcnt -= n) { 544 if (f->bcnt -= n) {
550 f->bufaddr += n; 545 f->bufaddr += n;
551 put_lba(ahout, f->lba += ahout->scnt); 546 put_lba(ahout, f->lba += ahout->scnt);
552 n = f->bcnt > DEFAULTBCNT ? DEFAULTBCNT : f->bcnt; 547 n = f->bcnt;
548 if (n > DEFAULTBCNT)
549 n = DEFAULTBCNT;
553 ahout->scnt = n >> 9; 550 ahout->scnt = n >> 9;
554 if (ahout->aflags & AOEAFL_WRITE) 551 if (ahout->aflags & AOEAFL_WRITE)
555 skb_fill_page_desc(f->skb, 0, virt_to_page(f->bufaddr), 552 skb_fill_page_desc(f->skb, 0,
553 virt_to_page(f->bufaddr),
556 offset_in_page(f->bufaddr), n); 554 offset_in_page(f->bufaddr), n);
557 skb_get(f->skb); 555 skb_get(f->skb);
558 f->skb->next = NULL; 556 f->skb->next = NULL;
@@ -565,19 +563,18 @@ aoecmd_ata_rsp(struct sk_buff *skb)
565 break; 563 break;
566 case WIN_IDENTIFY: 564 case WIN_IDENTIFY:
567 if (skb->len - sizeof *hin - sizeof *ahin < 512) { 565 if (skb->len - sizeof *hin - sizeof *ahin < 512) {
568 printk(KERN_INFO "aoe: aoecmd_ata_rsp: runt data size " 566 iprintk("runt data size in ataid. skb->len=%d\n",
569 "in ataid. skb->len=%d\n", skb->len); 567 skb->len);
570 spin_unlock_irqrestore(&d->lock, flags); 568 spin_unlock_irqrestore(&d->lock, flags);
571 return; 569 return;
572 } 570 }
573 ataid_complete(d, (char *) (ahin+1)); 571 ataid_complete(d, (char *) (ahin+1));
574 break; 572 break;
575 default: 573 default:
576 printk(KERN_INFO "aoe: aoecmd_ata_rsp: unrecognized " 574 iprintk("unrecognized ata command %2.2Xh for %d.%d\n",
577 "outbound ata command %2.2Xh for %d.%d\n", 575 ahout->cmdstat,
578 ahout->cmdstat, 576 be16_to_cpu(hin->major),
579 be16_to_cpu(hin->major), 577 hin->minor);
580 hin->minor);
581 } 578 }
582 } 579 }
583 580
@@ -634,8 +631,7 @@ aoecmd_ata_id(struct aoedev *d)
634 631
635 f = getframe(d, FREETAG); 632 f = getframe(d, FREETAG);
636 if (f == NULL) { 633 if (f == NULL) {
637 printk(KERN_CRIT "aoe: aoecmd_ata_id: can't get a frame. " 634 eprintk("can't get a frame. This shouldn't happen.\n");
638 "This shouldn't happen.\n");
639 return NULL; 635 return NULL;
640 } 636 }
641 637
@@ -682,15 +678,14 @@ aoecmd_cfg_rsp(struct sk_buff *skb)
682 */ 678 */
683 aoemajor = be16_to_cpu(h->major); 679 aoemajor = be16_to_cpu(h->major);
684 if (aoemajor == 0xfff) { 680 if (aoemajor == 0xfff) {
685 printk(KERN_CRIT "aoe: aoecmd_cfg_rsp: Warning: shelf " 681 eprintk("Warning: shelf address is all ones. "
686 "address is all ones. Check shelf dip switches\n"); 682 "Check shelf dip switches.\n");
687 return; 683 return;
688 } 684 }
689 685
690 sysminor = SYSMINOR(aoemajor, h->minor); 686 sysminor = SYSMINOR(aoemajor, h->minor);
691 if (sysminor * AOE_PARTITIONS + AOE_PARTITIONS > MINORMASK) { 687 if (sysminor * AOE_PARTITIONS + AOE_PARTITIONS > MINORMASK) {
692 printk(KERN_INFO 688 iprintk("e%ld.%d: minor number too large\n",
693 "aoe: e%ld.%d: minor number too large\n",
694 aoemajor, (int) h->minor); 689 aoemajor, (int) h->minor);
695 return; 690 return;
696 } 691 }
@@ -701,7 +696,7 @@ aoecmd_cfg_rsp(struct sk_buff *skb)
701 696
702 d = aoedev_by_sysminor_m(sysminor, n); 697 d = aoedev_by_sysminor_m(sysminor, n);
703 if (d == NULL) { 698 if (d == NULL) {
704 printk(KERN_INFO "aoe: aoecmd_cfg_rsp: device sysminor_m failure\n"); 699 iprintk("device sysminor_m failure\n");
705 return; 700 return;
706 } 701 }
707 702
diff --git a/drivers/block/aoe/aoedev.c b/drivers/block/aoe/aoedev.c
index abf1d3c073e3..f51d87bbb501 100644
--- a/drivers/block/aoe/aoedev.c
+++ b/drivers/block/aoe/aoedev.c
@@ -155,7 +155,7 @@ aoedev_by_sysminor_m(ulong sysminor, ulong bufcnt)
155 d = aoedev_newdev(bufcnt); 155 d = aoedev_newdev(bufcnt);
156 if (d == NULL) { 156 if (d == NULL) {
157 spin_unlock_irqrestore(&devlist_lock, flags); 157 spin_unlock_irqrestore(&devlist_lock, flags);
158 printk(KERN_INFO "aoe: aoedev_set: aoedev_newdev failure.\n"); 158 iprintk("aoedev_newdev failure.\n");
159 return NULL; 159 return NULL;
160 } 160 }
161 d->sysminor = sysminor; 161 d->sysminor = sysminor;
diff --git a/drivers/block/aoe/aoemain.c b/drivers/block/aoe/aoemain.c
index 727c34d8bc78..13e634db6fd4 100644
--- a/drivers/block/aoe/aoemain.c
+++ b/drivers/block/aoe/aoemain.c
@@ -84,13 +84,11 @@ aoe_init(void)
84 goto net_fail; 84 goto net_fail;
85 ret = register_blkdev(AOE_MAJOR, DEVICE_NAME); 85 ret = register_blkdev(AOE_MAJOR, DEVICE_NAME);
86 if (ret < 0) { 86 if (ret < 0) {
87 printk(KERN_ERR "aoe: aoeblk_init: can't register major\n"); 87 eprintk("can't register major\n");
88 goto blkreg_fail; 88 goto blkreg_fail;
89 } 89 }
90 90
91 printk(KERN_INFO 91 iprintk("AoE v%s initialised.\n", VERSION);
92 "aoe: aoe_init: AoE v%s initialised.\n",
93 VERSION);
94 discover_timer(TINIT); 92 discover_timer(TINIT);
95 return 0; 93 return 0;
96 94
@@ -103,7 +101,7 @@ aoe_init(void)
103 chr_fail: 101 chr_fail:
104 aoedev_exit(); 102 aoedev_exit();
105 103
106 printk(KERN_INFO "aoe: aoe_init: initialisation failure.\n"); 104 iprintk("initialisation failure.\n");
107 return ret; 105 return ret;
108} 106}
109 107
diff --git a/drivers/block/aoe/aoenet.c b/drivers/block/aoe/aoenet.c
index 1bba140549c9..f1cf2666fc7d 100644
--- a/drivers/block/aoe/aoenet.c
+++ b/drivers/block/aoe/aoenet.c
@@ -74,7 +74,7 @@ set_aoe_iflist(const char __user *user_str, size_t size)
74 return -EINVAL; 74 return -EINVAL;
75 75
76 if (copy_from_user(aoe_iflist, user_str, size)) { 76 if (copy_from_user(aoe_iflist, user_str, size)) {
77 printk(KERN_INFO "aoe: %s: copy from user failed\n", __FUNCTION__); 77 iprintk("copy from user failed\n");
78 return -EFAULT; 78 return -EFAULT;
79 } 79 }
80 aoe_iflist[size] = 0x00; 80 aoe_iflist[size] = 0x00;
@@ -132,8 +132,7 @@ aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt,
132 if (n > NECODES) 132 if (n > NECODES)
133 n = 0; 133 n = 0;
134 if (net_ratelimit()) 134 if (net_ratelimit())
135 printk(KERN_ERR "aoe: aoenet_rcv: error packet from %d.%d; " 135 eprintk("error packet from %d.%d; ecode=%d '%s'\n",
136 "ecode=%d '%s'\n",
137 be16_to_cpu(h->major), h->minor, 136 be16_to_cpu(h->major), h->minor,
138 h->err, aoe_errlist[n]); 137 h->err, aoe_errlist[n]);
139 goto exit; 138 goto exit;
@@ -147,7 +146,7 @@ aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt,
147 aoecmd_cfg_rsp(skb); 146 aoecmd_cfg_rsp(skb);
148 break; 147 break;
149 default: 148 default:
150 printk(KERN_INFO "aoe: aoenet_rcv: unknown cmd %d\n", h->cmd); 149 iprintk("unknown cmd %d\n", h->cmd);
151 } 150 }
152exit: 151exit:
153 dev_kfree_skb(skb); 152 dev_kfree_skb(skb);