Commit b67445fc authored by Wu Fengguang's avatar Wu Fengguang Committed by Linus Torvalds

generic swap(): iphase: rename swap() to swap_byte_order()

In preparation for the introduction of a generic swap() macro.
Signed-off-by: default avatarWu Fengguang <fengguang.wu@intel.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1a8a27c9
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include "iphase.h" #include "iphase.h"
#include "suni.h" #include "suni.h"
#define swap(x) (((x & 0xff) << 8) | ((x & 0xff00) >> 8)) #define swap_byte_order(x) (((x & 0xff) << 8) | ((x & 0xff00) >> 8))
#define PRIV(dev) ((struct suni_priv *) dev->phy_data) #define PRIV(dev) ((struct suni_priv *) dev->phy_data)
...@@ -1306,7 +1306,7 @@ static void rx_dle_intr(struct atm_dev *dev) ...@@ -1306,7 +1306,7 @@ static void rx_dle_intr(struct atm_dev *dev)
// get real pkt length pwang_test // get real pkt length pwang_test
trailer = (struct cpcs_trailer*)((u_char *)skb->data + trailer = (struct cpcs_trailer*)((u_char *)skb->data +
skb->len - sizeof(*trailer)); skb->len - sizeof(*trailer));
length = swap(trailer->length); length = swap_byte_order(trailer->length);
if ((length > iadev->rx_buf_sz) || (length > if ((length > iadev->rx_buf_sz) || (length >
(skb->len - sizeof(struct cpcs_trailer)))) (skb->len - sizeof(struct cpcs_trailer))))
{ {
...@@ -2995,7 +2995,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) { ...@@ -2995,7 +2995,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
skb->len, PCI_DMA_TODEVICE); skb->len, PCI_DMA_TODEVICE);
wr_ptr->local_pkt_addr = (buf_desc_ptr->buf_start_hi << 16) | wr_ptr->local_pkt_addr = (buf_desc_ptr->buf_start_hi << 16) |
buf_desc_ptr->buf_start_lo; buf_desc_ptr->buf_start_lo;
/* wr_ptr->bytes = swap(total_len); didn't seem to affect ?? */ /* wr_ptr->bytes = swap_byte_order(total_len); didn't seem to affect?? */
wr_ptr->bytes = skb->len; wr_ptr->bytes = skb->len;
/* hw bug - DLEs of 0x2d, 0x2e, 0x2f cause DMA lockup */ /* hw bug - DLEs of 0x2d, 0x2e, 0x2f cause DMA lockup */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment