Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6935d46c authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[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: default avatarPatrick McHardy <kaber@trash.net>
Acked-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 55820ee2

net/core/filter.c

+0 −12
Original line number Diff line number Diff line
@@ -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;