aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSyam Sidhardhan <syamsidhardh@gmail.com>2013-02-24 08:01:19 -0500
committerDavid S. Miller <davem@davemloft.net>2013-02-24 21:22:47 -0500
commitea5cdccc46d392b73d941c723630d37094e8e8ea (patch)
treeea870cac007b3d3b35ab2f9069a14a3900ad059b
parent48412a7e7db656b6a1e52799c39f461a06292395 (diff)
net/pasemi: Fix missing coding style
Fix missing () & { } Signed-off-by: Syam Sidhardhan <s.syam@samsung.com> Acked-by: Olof Johansson <olof@lixom.net> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/pasemi/pasemi_mac.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/ethernet/pasemi/pasemi_mac.c b/drivers/net/ethernet/pasemi/pasemi_mac.c
index 0be5844d6372..b1cfbb75ff1e 100644
--- a/drivers/net/ethernet/pasemi/pasemi_mac.c
+++ b/drivers/net/ethernet/pasemi/pasemi_mac.c
@@ -579,8 +579,9 @@ static void pasemi_mac_free_tx_resources(struct pasemi_mac *mac)
579 (TX_RING_SIZE-1)].dma; 579 (TX_RING_SIZE-1)].dma;
580 freed = pasemi_mac_unmap_tx_skb(mac, nfrags, 580 freed = pasemi_mac_unmap_tx_skb(mac, nfrags,
581 info->skb, dmas); 581 info->skb, dmas);
582 } else 582 } else {
583 freed = 2; 583 freed = 2;
584 }
584 } 585 }
585 586
586 kfree(txring->ring_info); 587 kfree(txring->ring_info);
@@ -808,8 +809,9 @@ static int pasemi_mac_clean_rx(struct pasemi_mac_rxring *rx,
808 skb->ip_summed = CHECKSUM_UNNECESSARY; 809 skb->ip_summed = CHECKSUM_UNNECESSARY;
809 skb->csum = (macrx & XCT_MACRX_CSUM_M) >> 810 skb->csum = (macrx & XCT_MACRX_CSUM_M) >>
810 XCT_MACRX_CSUM_S; 811 XCT_MACRX_CSUM_S;
811 } else 812 } else {
812 skb_checksum_none_assert(skb); 813 skb_checksum_none_assert(skb);
814 }
813 815
814 packets++; 816 packets++;
815 tot_bytes += len; 817 tot_bytes += len;
@@ -1829,10 +1831,11 @@ pasemi_mac_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
1829 dev_err(&mac->pdev->dev, "register_netdev failed with error %d\n", 1831 dev_err(&mac->pdev->dev, "register_netdev failed with error %d\n",
1830 err); 1832 err);
1831 goto out; 1833 goto out;
1832 } else if netif_msg_probe(mac) 1834 } else if (netif_msg_probe(mac)) {
1833 printk(KERN_INFO "%s: PA Semi %s: intf %d, hw addr %pM\n", 1835 printk(KERN_INFO "%s: PA Semi %s: intf %d, hw addr %pM\n",
1834 dev->name, mac->type == MAC_TYPE_GMAC ? "GMAC" : "XAUI", 1836 dev->name, mac->type == MAC_TYPE_GMAC ? "GMAC" : "XAUI",
1835 mac->dma_if, dev->dev_addr); 1837 mac->dma_if, dev->dev_addr);
1838 }
1836 1839
1837 return err; 1840 return err;
1838 1841