Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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>

authored by

Wu Fengguang and committed by
Linus Torvalds
b67445fc 1a8a27c9

+3 -3
+3 -3
drivers/atm/iphase.c
··· 64 64 #include <linux/jiffies.h> 65 65 #include "iphase.h" 66 66 #include "suni.h" 67 - #define swap(x) (((x & 0xff) << 8) | ((x & 0xff00) >> 8)) 67 + #define swap_byte_order(x) (((x & 0xff) << 8) | ((x & 0xff00) >> 8)) 68 68 69 69 #define PRIV(dev) ((struct suni_priv *) dev->phy_data) 70 70 ··· 1306 1306 // get real pkt length pwang_test 1307 1307 trailer = (struct cpcs_trailer*)((u_char *)skb->data + 1308 1308 skb->len - sizeof(*trailer)); 1309 - length = swap(trailer->length); 1309 + length = swap_byte_order(trailer->length); 1310 1310 if ((length > iadev->rx_buf_sz) || (length > 1311 1311 (skb->len - sizeof(struct cpcs_trailer)))) 1312 1312 { ··· 2995 2995 skb->len, PCI_DMA_TODEVICE); 2996 2996 wr_ptr->local_pkt_addr = (buf_desc_ptr->buf_start_hi << 16) | 2997 2997 buf_desc_ptr->buf_start_lo; 2998 - /* wr_ptr->bytes = swap(total_len); didn't seem to affect ?? */ 2998 + /* wr_ptr->bytes = swap_byte_order(total_len); didn't seem to affect?? */ 2999 2999 wr_ptr->bytes = skb->len; 3000 3000 3001 3001 /* hw bug - DLEs of 0x2d, 0x2e, 0x2f cause DMA lockup */