Home » Mailing list archives » linux-netdev » 2009 » June » 2

Re: [PATCH 1/3] f_phonet: dev_kfree_skb instead of dev_kfree_skb_any in TX callback

Previous thread: [PATCH] Phonet: fix accounting race between gprs_writeable() and gprs_xmit() by Rémi Denis-Courmont on Monday, June 1, 2009 - 3:35 am. (2 messages)

Next thread: Weird (after try of use arping2) by Paweł Staszewski on Monday, June 1, 2009 - 6:20 am. (1 message)
[view original message]
From: Rémi Denis-Courmont
Subject: [PATCH 1/3] f_phonet: dev_kfree_skb instead of dev_kfree_skb_any in TX callback
Date: Monday, June 1, 2009 - 4:18 am

From: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>

Network device TX is never run in IRQ context, and skb is freed outside
of the IRQ-disabling spin lock. So checking for IRQ was a waste of time
here.

Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/usb/gadget/f_phonet.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/gadget/f_phonet.c b/drivers/usb/gadget/f_phonet.c
index c1abeb8..54451ee 100644
--- a/drivers/usb/gadget/f_phonet.c
+++ b/drivers/usb/gadget/f_phonet.c
@@ -255,7 +255,7 @@ out_unlock:
 	spin_unlock_irqrestore(&port->lock, flags);
 out:
 	if (unlikely(skb)) {
-		dev_kfree_skb_any(skb);
+		dev_kfree_skb(skb);
 		dev->stats.tx_dropped++;
 	}
 	return 0;
-- 
1.6.0.4

--


[ message continues ]
[view original message]
From: Rémi Denis-Courmont
Subject: [PATCH 2/3] f_phonet: no need to check for carrier - scheduler does it internally
Date: Monday, June 1, 2009 - 4:18 am

From: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>

Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
---
 drivers/usb/gadget/f_phonet.c |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/drivers/usb/gadget/f_phonet.c b/drivers/usb/gadget/f_phonet.c
index 54451ee..d6b4871 100644
--- a/drivers/usb/gadget/f_phonet.c
+++ b/drivers/usb/gadget/f_phonet.c
@@ -188,8 +188,7 @@ static struct usb_descriptor_header *hs_pn_function[] = {
 
 static int pn_net_open(struct net_device *dev)
 {
-	if (netif_carrier_ok(dev))
-		netif_wake_queue(dev);
+	netif_wake_queue(dev);
 	return 0;
 }
 
@@ -219,8 +218,7 @@ static void pn_tx_complete(struct usb_ep *ep, struct usb_request *req)
 	}
 
 	dev_kfree_skb_any(skb);
-	if (netif_carrier_ok(dev))
-		netif_wake_queue(dev);
+	netif_wake_queue(dev);
 }
 
 static int pn_net_xmit(struct sk_buff *skb, struct net_device *dev)
@@ -383,7 +381,6 @@ static void __pn_reset(struct usb_function *f)
 	struct phonet_port *port = netdev_priv(dev);
 
 	netif_carrier_off(dev);
-	netif_stop_queue(dev);
 	port->usb = NULL;
 
 	usb_ep_disable(fp->out_ep);
@@ -427,8 +424,6 @@ static int pn_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
 			fp->in_ep->driver_data = fp;
 
 			netif_carrier_on(dev);
-			if (netif_running(dev))
-				netif_wake_queue(dev);
 			for (i = 0; i < phonet_rxq_size; i++)
 				pn_rx_submit(fp, fp->out_reqv[i], GFP_ATOMIC);
 		}
@@ -610,7 +605,6 @@ int __init gphonet_setup(struct usb_gadget *gadget)
 	port = netdev_priv(dev);
 	spin_lock_init(&port->lock);
 	netif_carrier_off(dev);
-	netif_stop_queue(dev);
 	SET_NETDEV_DEV(dev, &gadget->dev);
 
 	err = register_netdev(dev);
-- 
1.6.0.4

--


[ message continues ]
[view original message]
From: David Miller
Subject: Re: [PATCH 2/3] f_phonet: no need to check for carrier - scheduler does it internally
Date: Tuesday, June 2, 2009 - 12:18 am

From: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>

Applied to net-next-2.6
--


[ message continues ]
[view original message]
From: Rémi Denis-Courmont
Subject: [PATCH 3/3] usb: gadget: f_phonet: fix memory allocation sizes
Date: Monday, June 1, 2009 - 4:18 am

From: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>

Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/usb/gadget/f_phonet.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/usb/gadget/f_phonet.c b/drivers/usb/gadget/f_phonet.c
index d6b4871..96fb118 100644
--- a/drivers/usb/gadget/f_phonet.c
+++ b/drivers/usb/gadget/f_phonet.c
@@ -569,9 +569,10 @@ static struct net_device *dev;
 int __init phonet_bind_config(struct usb_configuration *c)
 {
 	struct f_phonet *fp;
-	int err;
+	int err, size;
 
-	fp = kzalloc(sizeof(*fp), GFP_KERNEL);
+	size = sizeof(*fp) + (phonet_rxq_size * sizeof(struct usb_request *));
+	fp = kzalloc(size, GFP_KERNEL);
 	if (!fp)
 		return -ENOMEM;
 
@@ -596,9 +597,7 @@ int __init gphonet_setup(struct usb_gadget *gadget)
 
 	/* Create net device */
 	BUG_ON(dev);
-	dev = alloc_netdev(sizeof(*port)
-		+ (phonet_rxq_size * sizeof(struct usb_request *)),
-				"upnlink%d", pn_net_setup);
+	dev = alloc_netdev(sizeof(*port), "upnlink%d", pn_net_setup);
 	if (!dev)
 		return -ENOMEM;
 
-- 
1.6.0.4

--


[ message continues ]
[view original message]
From: David Miller
Subject: Re: [PATCH 3/3] usb: gadget: f_phonet: fix memory allocation sizes
Date: Tuesday, June 2, 2009 - 12:18 am

From: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>

Applied to net-next-2.6
--


[ message continues ]
[view original message]
From: David Miller
Subject: Re: [PATCH 1/3] f_phonet: dev_kfree_skb instead of dev_kfree_skb_any in TX callback
Date: Tuesday, June 2, 2009 - 12:18 am

From: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>

Applied to net-next-2.6
--


[ message continues ]
Previous thread: [PATCH] Phonet: fix accounting race between gprs_writeable() and gprs_xmit() by Rémi Denis-Courmont on Monday, June 1, 2009 - 3:35 am. (2 messages)

Next thread: Weird (after try of use arping2) by Paweł Staszewski on Monday, June 1, 2009 - 6:20 am. (1 message)