From 5fca272595fce262a637f06e7f495fd27a24a728 Mon Sep 17 00:00:00 2001 From: Li RongQing Date: Tue, 18 Sep 2012 16:53:21 +0000 Subject: [PATCH] --- yaml --- r: 323085 b: refs/heads/master c: 8ea853fd0b721f14eacff1a5b364fe3e60d2dd82 h: refs/heads/master i: 323083: 68d71340f26a1ccdc5aadfa7e7afd6288b613b25 v: v3 --- [refs] | 2 +- trunk/net/core/skbuff.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9c1365e00acf..8c5341696548 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed3770a9cd5764a575b83810ea679bbff2b03082 +refs/heads/master: 8ea853fd0b721f14eacff1a5b364fe3e60d2dd82 diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c index fe00d1208167..e33ebae519c8 100644 --- a/trunk/net/core/skbuff.c +++ b/trunk/net/core/skbuff.c @@ -3502,7 +3502,9 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from, if (!skb_cloned(from)) skb_shinfo(from)->nr_frags = 0; - /* if the skb is cloned this does nothing since we set nr_frags to 0 */ + /* if the skb is not cloned this does nothing + * since we set nr_frags to 0. + */ for (i = 0; i < skb_shinfo(from)->nr_frags; i++) skb_frag_ref(from, i);