projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
[profile/ivi/kernel-adaptation-intel-automotive.git]
/
net
/
sched
/
cls_flow.c
diff --git
a/net/sched/cls_flow.c
b/net/sched/cls_flow.c
index
8ec0139
..
6994214
100644
(file)
--- a/
net/sched/cls_flow.c
+++ b/
net/sched/cls_flow.c
@@
-121,7
+121,7
@@
static u32 flow_get_proto_src(struct sk_buff *skb)
if (!pskb_network_may_pull(skb, sizeof(*iph)))
break;
iph = ip_hdr(skb);
if (!pskb_network_may_pull(skb, sizeof(*iph)))
break;
iph = ip_hdr(skb);
- if (ip
h->frag_off & htons(IP_MF | IP_OFFSET
))
+ if (ip
_is_fragment(iph
))
break;
poff = proto_ports_offset(iph->protocol);
if (poff >= 0 &&
break;
poff = proto_ports_offset(iph->protocol);
if (poff >= 0 &&
@@
-163,7
+163,7
@@
static u32 flow_get_proto_dst(struct sk_buff *skb)
if (!pskb_network_may_pull(skb, sizeof(*iph)))
break;
iph = ip_hdr(skb);
if (!pskb_network_may_pull(skb, sizeof(*iph)))
break;
iph = ip_hdr(skb);
- if (ip
h->frag_off & htons(IP_MF | IP_OFFSET
))
+ if (ip
_is_fragment(iph
))
break;
poff = proto_ports_offset(iph->protocol);
if (poff >= 0 &&
break;
poff = proto_ports_offset(iph->protocol);
if (poff >= 0 &&
@@
-356,7
+356,7
@@
static u32 flow_key_get(struct sk_buff *skb, int key)
}
}
}
}
-static int flow_classify(struct sk_buff *skb, struct tcf_proto *tp,
+static int flow_classify(struct sk_buff *skb,
const
struct tcf_proto *tp,
struct tcf_result *res)
{
struct flow_head *head = tp->root;
struct tcf_result *res)
{
struct flow_head *head = tp->root;