aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2005-07-05 14:08:57 -0700
committerDavid S. Miller <davem@davemloft.net>2005-07-05 14:08:57 -0700
commit6935d46c2da64aa032a557374c95336e265cd7ef (patch)
treed5fcf0146a5dd59baa09d4a03f6c50ba6f1b7ced
parent55820ee2f8c767a2833b21bd365e5753f50bd8ce (diff)
downloadlinux-stericsson-6935d46c2da64aa032a557374c95336e265cd7ef.tar.gz
[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>
-rw-r--r--net/core/filter.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/net/core/filter.c b/net/core/filter.c
index f3b88205ace2..e1267b465def 100644
--- 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;