Module: xenomai-gch
Branch: next
Commit: a18ba280be50cce695779c0d99df47df8948e27e
URL:    
http://git.xenomai.org/?p=xenomai-gch.git;a=commit;h=a18ba280be50cce695779c0d99df47df8948e27e

Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date:   Sun Nov  8 13:23:11 2015 +0100

cobalt/rtnet: igb: fix compilation issues

---

 kernel/drivers/net/drivers/igb/igb.h      |    2 --
 kernel/drivers/net/drivers/igb/igb_main.c |   17 ++++-------------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/kernel/drivers/net/drivers/igb/igb.h 
b/kernel/drivers/net/drivers/igb/igb.h
index 7d89910..16fb5e2 100644
--- a/kernel/drivers/net/drivers/igb/igb.h
+++ b/kernel/drivers/net/drivers/igb/igb.h
@@ -195,8 +195,6 @@ struct igb_tx_buffer {
        u16 gso_segs;
        __be16 protocol;
 
-       DEFINE_DMA_UNMAP_ADDR(dma);
-       DEFINE_DMA_UNMAP_LEN(len);
        u32 tx_flags;
 };
 
diff --git a/kernel/drivers/net/drivers/igb/igb_main.c 
b/kernel/drivers/net/drivers/igb/igb_main.c
index 86b060a..06303f5 100644
--- a/kernel/drivers/net/drivers/igb/igb_main.c
+++ b/kernel/drivers/net/drivers/igb/igb_main.c
@@ -427,10 +427,8 @@ static void igb_dump(struct igb_adapter *adapter)
                struct igb_tx_buffer *buffer_info;
                tx_ring = adapter->tx_ring[n];
                buffer_info = &tx_ring->tx_buffer_info[tx_ring->next_to_clean];
-               pr_info(" %5d %5X %5X %016llX %04X %p %016llX\n",
+               pr_info(" %5d %5X %5X %p %016llX\n",
                        n, tx_ring->next_to_use, tx_ring->next_to_clean,
-                       (u64)dma_unmap_addr(buffer_info, dma),
-                       dma_unmap_len(buffer_info, len),
                        buffer_info->next_to_watch,
                        (u64)buffer_info->time_stamp);
        }
@@ -473,12 +471,10 @@ static void igb_dump(struct igb_adapter *adapter)
                        else
                                next_desc = "";
 
-                       pr_info("T [0x%03X]    %016llX %016llX %016llX"
-                               " %04X  %p %016llX %p%s\n", i,
+                       pr_info("T [0x%03X]    %016llX %016llX"
+                               "  %p %016llX %p%s\n", i,
                                le64_to_cpu(u0->a),
                                le64_to_cpu(u0->b),
-                               (u64)dma_unmap_addr(buffer_info, dma),
-                               dma_unmap_len(buffer_info, len),
                                buffer_info->next_to_watch,
                                (u64)buffer_info->time_stamp,
                                buffer_info->skb, next_desc);
@@ -487,7 +483,7 @@ static void igb_dump(struct igb_adapter *adapter)
                                print_hex_dump(KERN_INFO, "",
                                        DUMP_PREFIX_ADDRESS,
                                        16, 1, buffer_info->skb->data,
-                                       dma_unmap_len(buffer_info, len),
+                                       14,
                                        true);
                }
        }
@@ -4102,10 +4098,6 @@ static void igb_tx_map(struct igb_ring *tx_ring,
 
        tx_buffer = first;
 
-       /* record length, and DMA address */
-       tx_buffer->len = size;
-       tx_buffer->dma = dma;
-
        tx_desc->read.buffer_addr = cpu_to_le64(dma);
        tx_desc->read.cmd_type_len = cpu_to_le32(cmd_type ^ size);
 
@@ -4646,7 +4638,6 @@ static bool igb_clean_tx_irq(struct igb_q_vector 
*q_vector)
 
                /* clear tx_buffer data */
                tx_buffer->skb = NULL;
-               tx_buffer->len = 0;
 
                /* clear last DMA location and unmap remaining buffers */
                while (tx_desc != eop_desc) {


_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://xenomai.org/mailman/listinfo/xenomai-git

Reply via email to