nps: jnet/jnet_shared.c - eliminated userland headers from kernel ...
baggins
baggins at pld-linux.org
Sun Jul 31 01:36:30 CEST 2005
Author: baggins Date: Sat Jul 30 23:36:30 2005 GMT
Module: nps Tag: HEAD
---- Log message:
- eliminated userland headers from kernel driver source (bswap_32 -> swab32)
---- Files affected:
nps/jnet:
jnet_shared.c (1.1.1.1 -> 1.2)
---- Diffs:
================================================================
Index: nps/jnet/jnet_shared.c
diff -u nps/jnet/jnet_shared.c:1.1.1.1 nps/jnet/jnet_shared.c:1.2
--- nps/jnet/jnet_shared.c:1.1.1.1 Mon Jul 25 21:42:55 2005
+++ nps/jnet/jnet_shared.c Sun Jul 31 01:36:25 2005
@@ -90,7 +90,7 @@
#include <asm/uaccess.h>
#include <asm/checksum.h>
#include <linux/pci.h>
-#include <byteswap.h>
+#include <linux/byteorder/swab.h>
#include <linux/delay.h>
#include <linux/proc_fs.h>
@@ -1024,7 +1024,7 @@
*fifo = priv->myConfigIpSettings.pid;
*fifo = priv->myConfigIpSettings.action;
- ip = bswap_32(priv->myConfigIpSettings.spIp);
+ ip = swab32(priv->myConfigIpSettings.spIp);
DEBUGP(D_TRACE, ("spIp = %08x\n",ip));
for(i=0; i<4; i++) {
*fifo = (ip & 0x000000ff);
@@ -1032,7 +1032,7 @@
}
//ip address is sent in little endian, hence the need to bswap.
- ip = bswap_32(priv->myConfigIpSettings.platIp);
+ ip = swab32(priv->myConfigIpSettings.platIp);
DEBUGP(D_TRACE, ("platIP = %08x\n",ip));
for(i=0; i<4; i++) {
*fifo = (ip & 0x000000ff);
@@ -1176,7 +1176,7 @@
}
#if SP
- ip = bswap_32(priv->myConfigIpSettings.spIp);
+ ip = swab32(priv->myConfigIpSettings.spIp);
#elif PLATFORM
ip = ntohl(priv->myConfigIpSettings.spIp);
#endif
@@ -1223,7 +1223,7 @@
}
#if SP
- ip = bswap_32(priv->myConfigIpSettings.platIp);
+ ip = swab32(priv->myConfigIpSettings.platIp);
#elif PLATFORM
ip = ntohl(priv->myConfigIpSettings.platIp);
#endif
================================================================
---- CVS-web:
http://cvs.pld-linux.org/nps/jnet/jnet_shared.c?r1=1.1.1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list