diff options
Diffstat (limited to 'net/ipv4/ip_fragment.c')
-rw-r--r-- | net/ipv4/ip_fragment.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index b7c41654dde5..168440834ade 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c | |||
@@ -116,11 +116,11 @@ static int ip4_frag_match(struct inet_frag_queue *q, void *a) | |||
116 | struct ip4_create_arg *arg = a; | 116 | struct ip4_create_arg *arg = a; |
117 | 117 | ||
118 | qp = container_of(q, struct ipq, q); | 118 | qp = container_of(q, struct ipq, q); |
119 | return (qp->id == arg->iph->id && | 119 | return qp->id == arg->iph->id && |
120 | qp->saddr == arg->iph->saddr && | 120 | qp->saddr == arg->iph->saddr && |
121 | qp->daddr == arg->iph->daddr && | 121 | qp->daddr == arg->iph->daddr && |
122 | qp->protocol == arg->iph->protocol && | 122 | qp->protocol == arg->iph->protocol && |
123 | qp->user == arg->user); | 123 | qp->user == arg->user; |
124 | } | 124 | } |
125 | 125 | ||
126 | /* Memory Tracking Functions. */ | 126 | /* Memory Tracking Functions. */ |
@@ -542,7 +542,7 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev, | |||
542 | /* If the first fragment is fragmented itself, we split | 542 | /* If the first fragment is fragmented itself, we split |
543 | * it to two chunks: the first with data and paged part | 543 | * it to two chunks: the first with data and paged part |
544 | * and the second, holding only fragments. */ | 544 | * and the second, holding only fragments. */ |
545 | if (skb_has_frags(head)) { | 545 | if (skb_has_frag_list(head)) { |
546 | struct sk_buff *clone; | 546 | struct sk_buff *clone; |
547 | int i, plen = 0; | 547 | int i, plen = 0; |
548 | 548 | ||