aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/myri10ge
diff options
context:
space:
mode:
authorBrice Goglin <brice@myri.com>2007-10-13 06:32:21 -0400
committerJeff Garzik <jeff@garzik.org>2007-10-15 14:24:07 -0400
commite636b2ead8260aca514a95f2dcb73b0454d1a869 (patch)
tree0bd4e22e4ca4f220ac9cec2a20a6775757375666 /drivers/net/myri10ge
parentdd957c57c52a3964b8446a3e868a08186274b628 (diff)
myri10ge: fix some indentation, white spaces, and comments
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> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/myri10ge')
-rw-r--r--drivers/net/myri10ge/myri10ge.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index e8afa101433e..5c103128e248 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -1047,7 +1047,8 @@ myri10ge_rx_done(struct myri10ge_priv *mgp, struct myri10ge_rx_buf *rx,
1047 1047
1048 hlen = MYRI10GE_HLEN > len ? len : MYRI10GE_HLEN; 1048 hlen = MYRI10GE_HLEN > len ? len : MYRI10GE_HLEN;
1049 1049
1050 /* allocate an skb to attach the page(s) to. */ 1050 /* allocate an skb to attach the page(s) to. This is done
1051 * after trying LRO, so as to avoid skb allocation overheads */
1051 1052
1052 skb = netdev_alloc_skb(dev, MYRI10GE_HLEN + 16); 1053 skb = netdev_alloc_skb(dev, MYRI10GE_HLEN + 16);
1053 if (unlikely(skb == NULL)) { 1054 if (unlikely(skb == NULL)) {
@@ -1217,7 +1218,8 @@ static inline void myri10ge_check_statblock(struct myri10ge_priv *mgp)
1217 1218
1218static int myri10ge_poll(struct napi_struct *napi, int budget) 1219static int myri10ge_poll(struct napi_struct *napi, int budget)
1219{ 1220{
1220 struct myri10ge_priv *mgp = container_of(napi, struct myri10ge_priv, napi); 1221 struct myri10ge_priv *mgp =
1222 container_of(napi, struct myri10ge_priv, napi);
1221 struct net_device *netdev = mgp->dev; 1223 struct net_device *netdev = mgp->dev;
1222 struct myri10ge_rx_done *rx_done = &mgp->rx_done; 1224 struct myri10ge_rx_done *rx_done = &mgp->rx_done;
1223 int work_done; 1225 int work_done;
@@ -2706,7 +2708,6 @@ static void myri10ge_select_firmware(struct myri10ge_priv *mgp)
2706} 2708}
2707 2709
2708#ifdef CONFIG_PM 2710#ifdef CONFIG_PM
2709
2710static int myri10ge_suspend(struct pci_dev *pdev, pm_message_t state) 2711static int myri10ge_suspend(struct pci_dev *pdev, pm_message_t state)
2711{ 2712{
2712 struct myri10ge_priv *mgp; 2713 struct myri10ge_priv *mgp;
@@ -2787,7 +2788,6 @@ abort_with_enabled:
2787 return -EIO; 2788 return -EIO;
2788 2789
2789} 2790}
2790
2791#endif /* CONFIG_PM */ 2791#endif /* CONFIG_PM */
2792 2792
2793static u32 myri10ge_read_reboot(struct myri10ge_priv *mgp) 2793static u32 myri10ge_read_reboot(struct myri10ge_priv *mgp)
@@ -2954,8 +2954,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
2954 2954
2955 mgp = netdev_priv(netdev); 2955 mgp = netdev_priv(netdev);
2956 mgp->dev = netdev; 2956 mgp->dev = netdev;
2957 netif_napi_add(netdev, &mgp->napi, 2957 netif_napi_add(netdev, &mgp->napi, myri10ge_poll, myri10ge_napi_weight);
2958 myri10ge_poll, myri10ge_napi_weight);
2959 mgp->pdev = pdev; 2958 mgp->pdev = pdev;
2960 mgp->csum_flag = MXGEFW_FLAGS_CKSUM; 2959 mgp->csum_flag = MXGEFW_FLAGS_CKSUM;
2961 mgp->pause = myri10ge_flow_control; 2960 mgp->pause = myri10ge_flow_control;