From: Libo Chen <clbchenlibo.chen@huawei.com>
To: <jhs@mojatatu.com>, David Miller <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>, LKML <linux-kernel@vger.kernel.org>,
<cgroups@vger.kernel.org>,
<containers@lists.linux-foundation.org>,
Li Zefan <lizefan@huawei.com>,
Serge Hallyn <serge.hallyn@ubuntu.com>
Subject: [RFC PATCH net-next 4/4] cls_cgroup: restore classid from skb->sk_classid
Date: Fri, 3 Jan 2014 11:11:17 +0800 [thread overview]
Message-ID: <52C62A55.4070901@huawei.com> (raw)
if skb->sk is NULL, we can try to restore from skb->bk_classid,
because we may have saved it.
Signed-off-by: Libo Chen <clbchenlibo.chen@huawei.com>
---
net/sched/cls_cgroup.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c
index d228a5d..6ab0e69 100644
--- a/net/sched/cls_cgroup.c
+++ b/net/sched/cls_cgroup.c
@@ -141,9 +141,10 @@ static int cls_cgroup_classify(struct sk_buff *skb, const struct tcf_proto *tp,
*/
if (in_serving_softirq()) {
/* If there is an sk_classid we'll use that. */
- if (!skb->sk)
- return -1;
- classid = skb->sk->sk_classid;
+ if (skb->sk)
+ classid = skb->sk->sk_classid;
+ else
+ classid = skb->backup_classid;
}
if (!classid)
--
1.8.2.2
reply other threads:[~2014-01-03 3:12 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52C62A55.4070901@huawei.com \
--to=clbchenlibo.chen@huawei.com \
--cc=cgroups@vger.kernel.org \
--cc=containers@lists.linux-foundation.org \
--cc=davem@davemloft.net \
--cc=jhs@mojatatu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=netdev@vger.kernel.org \
--cc=serge.hallyn@ubuntu.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox