diff options
Diffstat (limited to 'drivers/net/pch_gbe')
-rw-r--r-- | drivers/net/pch_gbe/pch_gbe.h | 14 | ||||
-rw-r--r-- | drivers/net/pch_gbe/pch_gbe_ethtool.c | 2 | ||||
-rw-r--r-- | drivers/net/pch_gbe/pch_gbe_main.c | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/pch_gbe/pch_gbe.h b/drivers/net/pch_gbe/pch_gbe.h index e1e33c80fb25..bf126e76fabf 100644 --- a/drivers/net/pch_gbe/pch_gbe.h +++ b/drivers/net/pch_gbe/pch_gbe.h | |||
@@ -351,7 +351,7 @@ struct pch_gbe_functions { | |||
351 | }; | 351 | }; |
352 | 352 | ||
353 | /** | 353 | /** |
354 | * struct pch_gbe_mac_info - MAC infomation | 354 | * struct pch_gbe_mac_info - MAC information |
355 | * @addr[6]: Store the MAC address | 355 | * @addr[6]: Store the MAC address |
356 | * @fc: Mode of flow control | 356 | * @fc: Mode of flow control |
357 | * @fc_autoneg: Auto negotiation enable for flow control setting | 357 | * @fc_autoneg: Auto negotiation enable for flow control setting |
@@ -375,7 +375,7 @@ struct pch_gbe_mac_info { | |||
375 | }; | 375 | }; |
376 | 376 | ||
377 | /** | 377 | /** |
378 | * struct pch_gbe_phy_info - PHY infomation | 378 | * struct pch_gbe_phy_info - PHY information |
379 | * @addr: PHY address | 379 | * @addr: PHY address |
380 | * @id: PHY's identifier | 380 | * @id: PHY's identifier |
381 | * @revision: PHY's revision | 381 | * @revision: PHY's revision |
@@ -393,7 +393,7 @@ struct pch_gbe_phy_info { | |||
393 | /*! | 393 | /*! |
394 | * @ingroup Gigabit Ether driver Layer | 394 | * @ingroup Gigabit Ether driver Layer |
395 | * @struct pch_gbe_bus_info | 395 | * @struct pch_gbe_bus_info |
396 | * @brief Bus infomation | 396 | * @brief Bus information |
397 | */ | 397 | */ |
398 | struct pch_gbe_bus_info { | 398 | struct pch_gbe_bus_info { |
399 | u8 type; | 399 | u8 type; |
@@ -404,7 +404,7 @@ struct pch_gbe_bus_info { | |||
404 | /*! | 404 | /*! |
405 | * @ingroup Gigabit Ether driver Layer | 405 | * @ingroup Gigabit Ether driver Layer |
406 | * @struct pch_gbe_hw | 406 | * @struct pch_gbe_hw |
407 | * @brief Hardware infomation | 407 | * @brief Hardware information |
408 | */ | 408 | */ |
409 | struct pch_gbe_hw { | 409 | struct pch_gbe_hw { |
410 | void *back; | 410 | void *back; |
@@ -462,7 +462,7 @@ struct pch_gbe_tx_desc { | |||
462 | 462 | ||
463 | 463 | ||
464 | /** | 464 | /** |
465 | * struct pch_gbe_buffer - Buffer infomation | 465 | * struct pch_gbe_buffer - Buffer information |
466 | * @skb: pointer to a socket buffer | 466 | * @skb: pointer to a socket buffer |
467 | * @dma: DMA address | 467 | * @dma: DMA address |
468 | * @time_stamp: time stamp | 468 | * @time_stamp: time stamp |
@@ -477,7 +477,7 @@ struct pch_gbe_buffer { | |||
477 | }; | 477 | }; |
478 | 478 | ||
479 | /** | 479 | /** |
480 | * struct pch_gbe_tx_ring - tx ring infomation | 480 | * struct pch_gbe_tx_ring - tx ring information |
481 | * @tx_lock: spinlock structs | 481 | * @tx_lock: spinlock structs |
482 | * @desc: pointer to the descriptor ring memory | 482 | * @desc: pointer to the descriptor ring memory |
483 | * @dma: physical address of the descriptor ring | 483 | * @dma: physical address of the descriptor ring |
@@ -499,7 +499,7 @@ struct pch_gbe_tx_ring { | |||
499 | }; | 499 | }; |
500 | 500 | ||
501 | /** | 501 | /** |
502 | * struct pch_gbe_rx_ring - rx ring infomation | 502 | * struct pch_gbe_rx_ring - rx ring information |
503 | * @desc: pointer to the descriptor ring memory | 503 | * @desc: pointer to the descriptor ring memory |
504 | * @dma: physical address of the descriptor ring | 504 | * @dma: physical address of the descriptor ring |
505 | * @size: length of descriptor ring in bytes | 505 | * @size: length of descriptor ring in bytes |
diff --git a/drivers/net/pch_gbe/pch_gbe_ethtool.c b/drivers/net/pch_gbe/pch_gbe_ethtool.c index c8c873b31a89..d2174a40d708 100644 --- a/drivers/net/pch_gbe/pch_gbe_ethtool.c +++ b/drivers/net/pch_gbe/pch_gbe_ethtool.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include "pch_gbe_api.h" | 21 | #include "pch_gbe_api.h" |
22 | 22 | ||
23 | /** | 23 | /** |
24 | * pch_gbe_stats - Stats item infomation | 24 | * pch_gbe_stats - Stats item information |
25 | */ | 25 | */ |
26 | struct pch_gbe_stats { | 26 | struct pch_gbe_stats { |
27 | char string[ETH_GSTRING_LEN]; | 27 | char string[ETH_GSTRING_LEN]; |
diff --git a/drivers/net/pch_gbe/pch_gbe_main.c b/drivers/net/pch_gbe/pch_gbe_main.c index 50986840c99c..2ef2f9cdefa6 100644 --- a/drivers/net/pch_gbe/pch_gbe_main.c +++ b/drivers/net/pch_gbe/pch_gbe_main.c | |||
@@ -1011,7 +1011,7 @@ static void pch_gbe_tx_queue(struct pch_gbe_adapter *adapter, | |||
1011 | tmp_skb->len = skb->len; | 1011 | tmp_skb->len = skb->len; |
1012 | memcpy(&tmp_skb->data[ETH_HLEN + 2], &skb->data[ETH_HLEN], | 1012 | memcpy(&tmp_skb->data[ETH_HLEN + 2], &skb->data[ETH_HLEN], |
1013 | (skb->len - ETH_HLEN)); | 1013 | (skb->len - ETH_HLEN)); |
1014 | /*-- Set Buffer infomation --*/ | 1014 | /*-- Set Buffer information --*/ |
1015 | buffer_info->length = tmp_skb->len; | 1015 | buffer_info->length = tmp_skb->len; |
1016 | buffer_info->dma = dma_map_single(&adapter->pdev->dev, tmp_skb->data, | 1016 | buffer_info->dma = dma_map_single(&adapter->pdev->dev, tmp_skb->data, |
1017 | buffer_info->length, | 1017 | buffer_info->length, |
@@ -1540,7 +1540,7 @@ int pch_gbe_setup_tx_resources(struct pch_gbe_adapter *adapter, | |||
1540 | size = (int)sizeof(struct pch_gbe_buffer) * tx_ring->count; | 1540 | size = (int)sizeof(struct pch_gbe_buffer) * tx_ring->count; |
1541 | tx_ring->buffer_info = vzalloc(size); | 1541 | tx_ring->buffer_info = vzalloc(size); |
1542 | if (!tx_ring->buffer_info) { | 1542 | if (!tx_ring->buffer_info) { |
1543 | pr_err("Unable to allocate memory for the buffer infomation\n"); | 1543 | pr_err("Unable to allocate memory for the buffer information\n"); |
1544 | return -ENOMEM; | 1544 | return -ENOMEM; |
1545 | } | 1545 | } |
1546 | 1546 | ||