File netdiag.unaligned.patch of Package netdiag
---
diag/alta-diag.c | 1 -
diag/diag-example.c | 1 -
diag/myson-diag.c | 1 -
diag/natsemi-diag.c | 1 -
diag/ns820-diag.c | 1 -
diag/pcnet-diag.c | 1 -
diag/tulip-diag.c | 15 +++++++--------
diag/via-diag.c | 1 -
8 files changed, 7 insertions(+), 15 deletions(-)
--- a/diag/alta-diag.c
+++ b/diag/alta-diag.c
@@ -86,7 +86,6 @@ static const char long_usage_msg[] =
/* The following are required only with unaligned field accesses. */
#include <asm/types.h>
-#include <asm/unaligned.h>
#if defined(__linux__) && __GNU_LIBRARY__ == 1
#include <asm/io.h> /* Newer libraries use <sys/io.h> instead. */
--- a/diag/diag-example.c
+++ b/diag/diag-example.c
@@ -92,7 +92,6 @@ static const char long_usage_msg[] =
/* The following are required only with unaligned field accesses. */
#include <asm/types.h>
-#include <asm/unaligned.h>
#if defined(__linux__) && __GNU_LIBRARY__ == 1
#include <asm/io.h> /* Newer libraries use <sys/io.h> instead. */
--- a/diag/myson-diag.c
+++ b/diag/myson-diag.c
@@ -83,7 +83,6 @@ static const char long_usage_msg[] =
/* The following are required only with unaligned field accesses. */
#include <asm/types.h>
-#include <asm/unaligned.h>
#if defined(__linux__) && __GNU_LIBRARY__ == 1
#include <asm/io.h> /* Newer libraries use <sys/io.h> instead. */
--- a/diag/natsemi-diag.c
+++ b/diag/natsemi-diag.c
@@ -92,7 +92,6 @@ static const char long_usage_msg[] =
/* The following are required only with unaligned field accesses. */
#include <asm/types.h>
-#include <asm/unaligned.h>
#if defined(__linux__) && __GNU_LIBRARY__ == 1
#include <asm/io.h> /* Newer libraries use <sys/io.h> instead. */
--- a/diag/ns820-diag.c
+++ b/diag/ns820-diag.c
@@ -85,7 +85,6 @@ static const char long_usage_msg[] =
/* The following are required only with unaligned field accesses. */
#include <asm/types.h>
-#include <asm/unaligned.h>
#if defined(__linux__) && __GNU_LIBRARY__ == 1
#include <asm/io.h> /* Newer libraries use <sys/io.h> instead. */
--- a/diag/pcnet-diag.c
+++ b/diag/pcnet-diag.c
@@ -88,7 +88,6 @@ static const char long_usage_msg[] =
#include <errno.h>
#include <asm/types.h>
-#include <asm/unaligned.h>
#if defined(__linux__) && __GNU_LIBRARY__ == 1
#include <asm/io.h>
--- a/diag/tulip-diag.c
+++ b/diag/tulip-diag.c
@@ -91,7 +91,6 @@ static const char long_usage_msg[] =
#include <ctype.h>
#include <asm/types.h>
-#include <asm/unaligned.h>
#if defined(__linux__) && __GNU_LIBRARY__ == 1
#include <asm/io.h> /* Newer libraries use <sys/io.h> instead. */
@@ -1491,7 +1490,7 @@ static void parse_eeprom(long ioaddr, un
return;
default_media_offset = ee_data[27];
p = (void *)ee_data + ee_data[27];
- default_media = get_unaligned((u16 *)p);
+ default_media = *((u16 *)p);
p += 2;
printf("Leaf node at offset %d, default media type %4.4x (%s).\n",
ee_data[27], default_media, default_media & 0x0800 ? "Autosense"
@@ -1552,11 +1551,11 @@ static void parse_eeprom(long ioaddr, un
printf(" 21143 MII initialization sequence is %d "
"words:", init_length);
for (i = 0; i < init_length; i++)
- printf(" %4.4x", get_unaligned(init_sequence + i));
+ printf(" %4.4x", *(init_sequence + i));
printf(".\n 21143 MII reset sequence is %d words:",
reset_length);
for (i = 0; i < reset_length; i++)
- printf(" %4.4x", get_unaligned(reset_sequence + i));
+ printf(" %4.4x", *(reset_sequence + i));
printf(".\n");
} else {
u8 *init_sequence = p + 4;
@@ -1582,10 +1581,10 @@ static void parse_eeprom(long ioaddr, un
printf(" Media capabilities are %4.4x, advertising %4.4x.\n"
" Full-duplex map %4.4x, Threshold map %4.4x.\n",
- get_unaligned(misc_info + 0),
- get_unaligned(misc_info + 1) | 1,
- get_unaligned(misc_info + 2),
- get_unaligned(misc_info + 3));
+ *(misc_info + 0),
+ *(misc_info + 1) | 1,
+ *(misc_info + 2),
+ *(misc_info + 3));
if (blk_type == 3) { /* 21142 */
if ((*(u8 *)(misc_info+4)) > 0)
printf(" MII interrupt on GPIO pin %d.\n",
--- a/diag/via-diag.c
+++ b/diag/via-diag.c
@@ -92,7 +92,6 @@ static const char long_usage_msg[] =
/* The following are required only with unaligned field accesses. */
#include <asm/types.h>
-#include <asm/unaligned.h>
#if defined(__linux__) && __GNU_LIBRARY__ == 1
#include <asm/io.h> /* Newer libraries use <sys/io.h> instead. */
