소스 검색

ipfrag : frag_kfree_skb() cleanup

Third param (work) is unused, remove it.

Remove __inline__ and inline qualifiers.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Eric Dumazet 15 년 전
부모
커밋
a95d8c88be
2개의 변경된 파일5개의 추가작업 그리고 11개의 파일을 삭제
  1. 3 6
      net/ipv4/ip_fragment.c
  2. 2 5
      net/ipv6/reassembly.c

+ 3 - 6
net/ipv4/ip_fragment.c

@@ -124,11 +124,8 @@ static int ip4_frag_match(struct inet_frag_queue *q, void *a)
 }
 }
 
 
 /* Memory Tracking Functions. */
 /* Memory Tracking Functions. */
-static __inline__ void frag_kfree_skb(struct netns_frags *nf,
-		struct sk_buff *skb, int *work)
+static void frag_kfree_skb(struct netns_frags *nf, struct sk_buff *skb)
 {
 {
-	if (work)
-		*work -= skb->truesize;
 	atomic_sub(skb->truesize, &nf->mem);
 	atomic_sub(skb->truesize, &nf->mem);
 	kfree_skb(skb);
 	kfree_skb(skb);
 }
 }
@@ -309,7 +306,7 @@ static int ip_frag_reinit(struct ipq *qp)
 	fp = qp->q.fragments;
 	fp = qp->q.fragments;
 	do {
 	do {
 		struct sk_buff *xp = fp->next;
 		struct sk_buff *xp = fp->next;
-		frag_kfree_skb(qp->q.net, fp, NULL);
+		frag_kfree_skb(qp->q.net, fp);
 		fp = xp;
 		fp = xp;
 	} while (fp);
 	} while (fp);
 
 
@@ -446,7 +443,7 @@ static int ip_frag_queue(struct ipq *qp, struct sk_buff *skb)
 				qp->q.fragments = next;
 				qp->q.fragments = next;
 
 
 			qp->q.meat -= free_it->len;
 			qp->q.meat -= free_it->len;
-			frag_kfree_skb(qp->q.net, free_it, NULL);
+			frag_kfree_skb(qp->q.net, free_it);
 		}
 		}
 	}
 	}
 
 

+ 2 - 5
net/ipv6/reassembly.c

@@ -150,11 +150,8 @@ int ip6_frag_match(struct inet_frag_queue *q, void *a)
 EXPORT_SYMBOL(ip6_frag_match);
 EXPORT_SYMBOL(ip6_frag_match);
 
 
 /* Memory Tracking Functions. */
 /* Memory Tracking Functions. */
-static inline void frag_kfree_skb(struct netns_frags *nf,
-		struct sk_buff *skb, int *work)
+static void frag_kfree_skb(struct netns_frags *nf, struct sk_buff *skb)
 {
 {
-	if (work)
-		*work -= skb->truesize;
 	atomic_sub(skb->truesize, &nf->mem);
 	atomic_sub(skb->truesize, &nf->mem);
 	kfree_skb(skb);
 	kfree_skb(skb);
 }
 }
@@ -392,7 +389,7 @@ static int ip6_frag_queue(struct frag_queue *fq, struct sk_buff *skb,
 				fq->q.fragments = next;
 				fq->q.fragments = next;
 
 
 			fq->q.meat -= free_it->len;
 			fq->q.meat -= free_it->len;
-			frag_kfree_skb(fq->q.net, free_it, NULL);
+			frag_kfree_skb(fq->q.net, free_it);
 		}
 		}
 	}
 	}