From: Kirill Korotaev <dev@openvz.org>

Fix unaligned access warnings noticed on IA64 in sk_run_filter().  'ptr'
can be unaligned.

Signed-off-by: Dmitry Mishin <dim@openvz.org>
Signed-off-by: Kirill Korotaev <dev@openvz.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 net/core/filter.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff -puN net/core/filter.c~unaligned-access-in-sk_run_filter net/core/filter.c
--- devel/net/core/filter.c~unaligned-access-in-sk_run_filter	2006-04-17 21:29:03.000000000 -0700
+++ devel-akpm/net/core/filter.c	2006-04-17 21:29:03.000000000 -0700
@@ -34,6 +34,7 @@
 #include <linux/timer.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
+#include <asm/unaligned.h>
 #include <linux/filter.h>
 
 /* No hurry in this branch */
@@ -177,7 +178,7 @@ unsigned int sk_run_filter(struct sk_buf
 load_w:
 			ptr = load_pointer(skb, k, 4, &tmp);
 			if (ptr != NULL) {
-				A = ntohl(*(u32 *)ptr);
+				A = ntohl(get_unaligned((u32 *)ptr));
 				continue;
 			}
 			break;
@@ -186,7 +187,7 @@ load_w:
 load_h:
 			ptr = load_pointer(skb, k, 2, &tmp);
 			if (ptr != NULL) {
-				A = ntohs(*(u16 *)ptr);
+				A = ntohs(get_unaligned((u16 *)ptr));
 				continue;
 			}
 			break;
_