update copyright date to 2013

[dpdk.git] / lib / librte_pmd_e1000 / igb_rxtx.c

diff --git a/lib/librte_pmd_e1000/igb_rxtx.c b/lib/librte_pmd_e1000/igb_rxtx.c
index 46f6f29..914c956 100644 (file)
--- a/lib/librte_pmd_e1000/igb_rxtx.c
+++ b/lib/librte_pmd_e1000/igb_rxtx.c
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  * 
- *   Copyright(c) 2010-2012 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
  *   All rights reserved.
  * 
  *   Redistribution and use in source and binary forms, with or without 
@@ -336,8 +336,8 @@ eth_igb_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
        uint16_t tx_last;
        uint16_t nb_tx;
        uint16_t tx_ol_req;
-       uint32_t new_ctx;
-       uint32_t ctx;
+       uint32_t new_ctx = 0;
+       uint32_t ctx = 0;
        uint32_t vlan_macip_lens;
 
        txq = tx_queue;
@@ -1231,8 +1231,6 @@ eth_igb_tx_queue_setup(struct rte_eth_dev *dev,
        txq->tx_ring_phys_addr = (uint64_t) tz->phys_addr;
        txq->tx_ring = (union e1000_adv_tx_desc *) tz->addr;
 
-       size = sizeof(union e1000_adv_tx_desc) * nb_desc;
-
        /* Allocate software ring */
        txq->sw_ring = rte_zmalloc("txq->sw_ring",
                                   sizeof(struct igb_tx_entry) * nb_desc,
@@ -1717,8 +1715,8 @@ eth_igb_rx_init(struct rte_eth_dev *dev)
        if (dev->data->dev_conf.rxmode.hw_strip_crc) {
                rctl |= E1000_RCTL_SECRC; /* Strip Ethernet CRC. */
 
-               /* set STRCRC bit in all queues for Powerville */
-               if (hw->mac.type == e1000_i350) {
+               /* set STRCRC bit in all queues for Powerville/Springville */
+               if (hw->mac.type == e1000_i350 || hw->mac.type == e1000_i210) {
                        for (i = 0; i < dev->data->nb_rx_queues; i++) {
                                uint32_t dvmolr = E1000_READ_REG(hw,
                                        E1000_DVMOLR(i));
@@ -1729,8 +1727,8 @@ eth_igb_rx_init(struct rte_eth_dev *dev)
        } else {
                rctl &= ~E1000_RCTL_SECRC; /* Do not Strip Ethernet CRC. */
 
-               /* clear STRCRC bit in all queues for Powerville */
-               if (hw->mac.type == e1000_i350) {
+               /* clear STRCRC bit in all queues for Powerville/Springville */
+               if (hw->mac.type == e1000_i350 || hw->mac.type == e1000_i210) {
                        for (i = 0; i < dev->data->nb_rx_queues; i++) {
                                uint32_t dvmolr = E1000_READ_REG(hw,
                                        E1000_DVMOLR(i));