linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / net / core / filter.c

diff --git a/net/core/filter.c b/net/core/filter.c
index 5b4486a..93fbd01 100644 (file)
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -34,7 +34,6 @@
 #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 */
@@ -178,7 +177,7 @@ unsigned int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int
 load_w:
                        ptr = load_pointer(skb, k, 4, &tmp);
                        if (ptr != NULL) {
-                               A = ntohl(get_unaligned((u32 *)ptr));
+                               A = ntohl(*(u32 *)ptr);
                                continue;
                        }
                        break;
@@ -187,7 +186,7 @@ load_w:
 load_h:
                        ptr = load_pointer(skb, k, 2, &tmp);
                        if (ptr != NULL) {
-                               A = ntohs(get_unaligned((u16 *)ptr));
+                               A = ntohs(*(u16 *)ptr);
                                continue;
                        }
                        break;