git.openpandora.org
/
pandora-kernel.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/davem/net-next
[pandora-kernel.git]
/
net
/
ipv4
/
ip_input.c
diff --git
a/net/ipv4/ip_input.c
b/net/ipv4/ip_input.c
index
c8f48ef
..
073a9b0
100644
(file)
--- a/
net/ipv4/ip_input.c
+++ b/
net/ipv4/ip_input.c
@@
-165,7
+165,7
@@
int ip_call_ra_chain(struct sk_buff *skb)
(!sk->sk_bound_dev_if ||
sk->sk_bound_dev_if == dev->ifindex) &&
net_eq(sock_net(sk), dev_net(dev))) {
(!sk->sk_bound_dev_if ||
sk->sk_bound_dev_if == dev->ifindex) &&
net_eq(sock_net(sk), dev_net(dev))) {
- if (ip_
hdr(skb)->frag_off & htons(IP_MF | IP_OFFSET
)) {
+ if (ip_
is_fragment(ip_hdr(skb)
)) {
if (ip_defrag(skb, IP_DEFRAG_CALL_RA_CHAIN))
return 1;
}
if (ip_defrag(skb, IP_DEFRAG_CALL_RA_CHAIN))
return 1;
}
@@
-256,7
+256,7
@@
int ip_local_deliver(struct sk_buff *skb)
* Reassemble IP fragments.
*/
* Reassemble IP fragments.
*/
- if (ip_
hdr(skb)->frag_off & htons(IP_MF | IP_OFFSET
)) {
+ if (ip_
is_fragment(ip_hdr(skb)
)) {
if (ip_defrag(skb, IP_DEFRAG_LOCAL_DELIVER))
return 0;
}
if (ip_defrag(skb, IP_DEFRAG_LOCAL_DELIVER))
return 0;
}