[NET]: Remove redundant code in net/core/filter.c

skb_header_pointer handles linear and non-linear data, no need to handle
linear data again.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/core/filter.c b/net/core/filter.c
index f3b88205ace2151167bb85d15b6b23d5373a97a7..e1267b465def6809a2fada03a208e15fafd90edf 100644 (file)
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -168,10 +168,6 @@ int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int flen)
                case BPF_LD|BPF_W|BPF_ABS:
                        k = fentry->k;
  load_w:
-                       if (k >= 0 && (unsigned int)(k+sizeof(u32)) <= len) {
-                               A = ntohl(*(u32*)&data[k]);
-                               continue;
-                       }
                        if (k < 0) {
                                u8 *ptr;
 
@@ -194,10 +190,6 @@ int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int flen)
                case BPF_LD|BPF_H|BPF_ABS:
                        k = fentry->k;
  load_h:
-                       if (k >= 0 && (unsigned int)(k + sizeof(u16)) <= len) {
-                               A = ntohs(*(u16*)&data[k]);
-                               continue;
-                       }
                        if (k < 0) {
                                u8 *ptr;
 
@@ -220,10 +212,6 @@ int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int flen)
                case BPF_LD|BPF_B|BPF_ABS:
                        k = fentry->k;
 load_b:
-                       if (k >= 0 && (unsigned int)k < len) {
-                               A = data[k];
-                               continue;
-                       }
                        if (k < 0) {
                                u8 *ptr;