Merge tag 'tty-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[linux-2.6-microblaze.git] / drivers / staging / octeon / ethernet-tx.c

diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c
index 8346906..b334cf8 100644 (file)
--- a/drivers/staging/octeon/ethernet-tx.c
+++ b/drivers/staging/octeon/ethernet-tx.c
@@ -127,7 +127,7 @@ static void cvm_oct_free_tx_skbs(struct net_device *dev)
  */
 int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-       cvmx_pko_command_word0_t pko_command;
+       union cvmx_pko_command_word0 pko_command;
        union cvmx_buf_ptr hw_buffer;
        u64 old_scratch;
        u64 old_scratch2;
@@ -514,7 +514,7 @@ int cvm_oct_xmit_pow(struct sk_buff *skb, struct net_device *dev)
        void *copy_location;
 
        /* Get a work queue entry */
-       cvmx_wqe_t *work = cvmx_fpa_alloc(CVMX_FPA_WQE_POOL);
+       struct cvmx_wqe *work = cvmx_fpa_alloc(CVMX_FPA_WQE_POOL);
 
        if (unlikely(!work)) {
                printk_ratelimited("%s: Failed to allocate a work queue entry\n",
@@ -598,7 +598,7 @@ int cvm_oct_xmit_pow(struct sk_buff *skb, struct net_device *dev)
 #endif
                work->word2.s.is_frag = !((ip_hdr(skb)->frag_off == 0) ||
                                          (ip_hdr(skb)->frag_off ==
-                                             1 << 14));
+                                             cpu_to_be16(1 << 14)));
 #if 0
                /* Assume Linux is sending a good packet */
                work->word2.s.IP_exc = 0;