adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
In preparation for the introduction of a generic swap() macro.

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Wu Fengguang 2009-01-07 18:09:10 -08:00 committed by Linus Torvalds
parent 1a8a27c974
commit b67445fc17
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/atm/iphase.c
View file

@ -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)
// 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) {
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 */