Attachment #873123 for bug #1218562

View | Details | Raw Unified | Return to bug 1218562
Collapse All | Expand All




	rcu_read_lock();
	for_each_netdev_rcu(&init_net, ifp) {
		dev_hold(ifp);
		if (!is_aoe_netif(ifp)) {
			dev_put(ifp);
			continue;
		}

		skb = new_skb(sizeof *h + sizeof *ch);
		if (skb == NULL) {
			printk(KERN_INFO "aoe: skb alloc failure\n");
			dev_put(ifp);
			continue;
		}
		skb_put(skb, sizeof *h + sizeof *ch);
		skb->dev = ifp;

		h->major = cpu_to_be16(aoemajor);
		h->minor = aoeminor;
		h->cmd = AOECMD_CFG;

cont:
		dev_put(ifp);
	}
	rcu_read_unlock();
}

Lines 63-68 tx(int id) __must_hold(&txlock) Link Here

(-)a/drivers/block/aoe/aoenet.c (-1 / +1 lines)
63	pr_warn("aoe: packet could not be sent on %s. %s\n",	63	pr_warn("aoe: packet could not be sent on %s. %s\n",
64	ifp ? ifp->name : "netif",	64	ifp ? ifp->name : "netif",
65	"consider increasing tx_queue_len");	65	"consider increasing tx_queue_len");
		66	dev_put(ifp);
66	spin_lock_irq(&txlock);	67	spin_lock_irq(&txlock);
67	}	68	}
68	return 0;	69	return 0;
69	-

Return to bug 1218562

Lines 419-431 aoecmd_cfg_pkts(ushort aoemajor, unsigned char aoeminor, struct sk_buff_head *qu Link Here

(-)a/drivers/block/aoe/aoecmd.c (-6 / +6 lines)
419	rcu_read_lock();	419	rcu_read_lock();
420	for_each_netdev_rcu(&init_net, ifp) {	420	for_each_netdev_rcu(&init_net, ifp) {
421	dev_hold(ifp);	421	dev_hold(ifp);
422	if (!is_aoe_netif(ifp))	422	if (!is_aoe_netif(ifp)) {
423	goto cont;	423	dev_put(ifp);
		424	continue;
		425	}
424		426
425	skb = new_skb(sizeof h + sizeof ch);	427	skb = new_skb(sizeof h + sizeof ch);
426	if (skb == NULL) {	428	if (skb == NULL) {
427	printk(KERN_INFO "aoe: skb alloc failure\n");	429	printk(KERN_INFO "aoe: skb alloc failure\n");
428	goto cont;	430	dev_put(ifp);
		431	continue;
429	}	432	}
430	skb_put(skb, sizeof h + sizeof ch);	433	skb_put(skb, sizeof h + sizeof ch);
431	skb->dev = ifp;	434	skb->dev = ifp;
Lines 440-448 aoecmd_cfg_pkts(ushort aoemajor, unsigned char aoeminor, struct sk_buff_head *qu Link Here
440	h->major = cpu_to_be16(aoemajor);	443	h->major = cpu_to_be16(aoemajor);
441	h->minor = aoeminor;	444	h->minor = aoeminor;
442	h->cmd = AOECMD_CFG;	445	h->cmd = AOECMD_CFG;
443
444	cont:
445	dev_put(ifp);
446	}	446	}
447	rcu_read_unlock();	447	rcu_read_unlock();
448	}	448	}