net: Add and use skb_list_del_init(). (992cba7e) · Commits · 戴 / test

include/linux/skbuff.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -1344,6 +1344,12 @@ static inline void skb_mark_not_on_list(struct sk_buff *skb)
		skb->next = NULL;
		}

		static inline void skb_list_del_init(struct sk_buff *skb)
		{
		__list_del_entry(&skb->list);
		skb_mark_not_on_list(skb);
		}

		/**
		* skb_queue_empty - check if a queue is empty
		* @list: queue head

+2 −4

Original line number	Diff line number	Diff line
		@@ -5295,8 +5295,7 @@ static void __napi_gro_flush_chain(struct napi_struct *napi, u32 index,
		list_for_each_entry_safe_reverse(skb, p, head, list) {
		if (flush_old && NAPI_GRO_CB(skb)->age == jiffies)
		return;
		list_del(&skb->list);
		skb_mark_not_on_list(skb);
		skb_list_del_init(skb);
		napi_gro_complete(skb);
		napi->gro_hash[index].count--;
		}
		@@ -5481,8 +5480,7 @@ static enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff
		ret = NAPI_GRO_CB(skb)->free ? GRO_MERGED_FREE : GRO_MERGED;

		if (pp) {
		list_del(&pp->list);
		skb_mark_not_on_list(pp);
		skb_list_del_init(pp);
		napi_gro_complete(pp);
		napi->gro_hash[hash].count--;
		}

+1 −5

Original line number	Diff line number	Diff line
		@@ -531,11 +531,7 @@ static void ip_sublist_rcv_finish(struct list_head *head)
		struct sk_buff skb, next;

		list_for_each_entry_safe(skb, next, head, list) {
		list_del(&skb->list);
		/* Handle ip{6}_forward case, as sch_direct_xmit have
		* another kind of SKB-list usage (see validate_xmit_skb_list)
		*/
		skb_mark_not_on_list(skb);
		skb_list_del_init(skb);
		dst_input(skb);
		}
		}