From: Brice Goglin <brice@myri.com>
To: Jeff Garzik <jeff@garzik.org>
Cc: netdev@vger.kernel.org
Subject: [PATCH 1/5] myri10ge: fix some indentation, white spaces, and comments
Date: Sat, 13 Oct 2007 12:32:21 +0200 [thread overview]
Message-ID: <47109EB5.6060801@myri.com> (raw)
In-Reply-To: <47109E8A.8080205@myri.com>
Fix one comment in myri10ge.c and update indendation and white spaces
to match the code generated by indent from upstream CVS.
Signed-off-by: Brice Goglin <brice@myri.com>
---
drivers/net/myri10ge/myri10ge.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
Index: linux-git/drivers/net/myri10ge/myri10ge.c
===================================================================
--- linux-git.orig/drivers/net/myri10ge/myri10ge.c 2007-10-13 10:19:43.000000000 +0200
+++ linux-git/drivers/net/myri10ge/myri10ge.c 2007-10-13 11:59:18.000000000 +0200
@@ -1047,7 +1047,8 @@
hlen = MYRI10GE_HLEN > len ? len : MYRI10GE_HLEN;
- /* allocate an skb to attach the page(s) to. */
+ /* allocate an skb to attach the page(s) to. This is done
+ * after trying LRO, so as to avoid skb allocation overheads */
skb = netdev_alloc_skb(dev, MYRI10GE_HLEN + 16);
if (unlikely(skb == NULL)) {
@@ -1217,7 +1218,8 @@
static int myri10ge_poll(struct napi_struct *napi, int budget)
{
- struct myri10ge_priv *mgp = container_of(napi, struct myri10ge_priv, napi);
+ struct myri10ge_priv *mgp =
+ container_of(napi, struct myri10ge_priv, napi);
struct net_device *netdev = mgp->dev;
struct myri10ge_rx_done *rx_done = &mgp->rx_done;
int work_done;
@@ -2706,7 +2708,6 @@
}
#ifdef CONFIG_PM
-
static int myri10ge_suspend(struct pci_dev *pdev, pm_message_t state)
{
struct myri10ge_priv *mgp;
@@ -2787,7 +2788,6 @@
return -EIO;
}
-
#endif /* CONFIG_PM */
static u32 myri10ge_read_reboot(struct myri10ge_priv *mgp)
@@ -2954,8 +2954,7 @@
mgp = netdev_priv(netdev);
mgp->dev = netdev;
- netif_napi_add(netdev, &mgp->napi,
- myri10ge_poll, myri10ge_napi_weight);
+ netif_napi_add(netdev, &mgp->napi, myri10ge_poll, myri10ge_napi_weight);
mgp->pdev = pdev;
mgp->csum_flag = MXGEFW_FLAGS_CKSUM;
mgp->pause = myri10ge_flow_control;
next prev parent reply other threads:[~2007-10-13 10:33 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-13 10:31 [PATCH 0/5] myri10ge updates for 2.6.24 Brice Goglin
2007-10-13 10:32 ` Brice Goglin [this message]
2007-10-15 18:24 ` [PATCH 1/5] myri10ge: fix some indentation, white spaces, and comments Jeff Garzik
2007-10-13 10:32 ` [PATCH 2/5] myri10ge: update firmware headers Brice Goglin
2007-10-13 10:33 ` [PATCH 3/5] [IPV6]: Add skb_is_gso_v6 Brice Goglin
2007-10-15 9:06 ` David Miller
2007-10-15 17:20 ` Jeff Garzik
2007-10-13 10:34 ` [PATCH 4/5] myri10ge: add IPv6 TSO support Brice Goglin
2007-10-13 10:34 ` [PATCH 5/5] myri10ge: update driver version to 1.3.2-1.287 Brice Goglin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=47109EB5.6060801@myri.com \
--to=brice@myri.com \
--cc=jeff@garzik.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).