From patchwork Fri Jan 20 14:36:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 717754 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3v4k0w6Ycxz9sCg for ; Sat, 21 Jan 2017 01:41:20 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CE8yckMP"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752491AbdATOlT (ORCPT ); Fri, 20 Jan 2017 09:41:19 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:36061 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752319AbdATOlR (ORCPT ); Fri, 20 Jan 2017 09:41:17 -0500 Received: by mail-pf0-f194.google.com with SMTP id 19so5597205pfo.3; Fri, 20 Jan 2017 06:41:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=lcB2kna8lyxzXObnT3b6na2LlyoF3jgIJN7azYnkyVE=; b=CE8yckMPeNAgnHKegyiMhmK38/ygFtZwtDbb9ugl0/M4VkEPi4J3ek5j1uz9pe3oUs A3l2NFkixfN/ZhiwEK/mUNqtVh7IaN/URZt01ZqH7ihVqdJ9ZZba7dc28RKN1mF4/TRN S6zA+GIwgzPse0+HOYXsaJzLk3SiAF/8sEGIhdyArCGDv7TcJD8MHAtSwPx/7osP6jpP rquRNeYnJWxIM4RPKOMAyuQZG44x572Ke1CvdmeopTbhRmL1uOf1h1/wFn+6WbPo8/kP CnKfYhwOfNlCER9guKz/zMd/lnLEVeaHxL+uq4tVw2h+h5nnLIo55iKF6jH8Y1A/UgHk SqnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=lcB2kna8lyxzXObnT3b6na2LlyoF3jgIJN7azYnkyVE=; b=EZ2JDO4w/AZj5hl4xfOLsgFCpjjtqx5GxUuMRhMVucxI8tIHtRwXx5ZotDPFMcdbQU 2G0ToLvQZXANX1VZIOYyPpQw98TUl4v4avVMMoM2Z5eWBDBTMh3lJtUsaN2xLppy4Voo NpAhawKaLucyOrxz8pT+nPVA5a+qBtpwAF8Hq5qNI6IdaBeaOOj0cV4CEx3Vu+iNFUSz dX60T+AYxs1VA0xutQL2PTNAbvKPoXmRQ2MkyLdT3xdN0WLzlvvOtRaO9xPtEwbaGjr+ YerATv/ziQLI65d7sfv3rR1J8HcB8gfvuMl2N4H4UERMuBSCk5LKdhzbDrp0zvSa9HCZ CkhQ== X-Gm-Message-State: AIkVDXLwNlDeRQOwCATnln3tF/tbiLeNSWncJBc5ozmFinyczM4UmOTdMxlewTwTMhv2kQ== X-Received: by 10.98.163.23 with SMTP id s23mr16888866pfe.60.1484923023956; Fri, 20 Jan 2017 06:37:03 -0800 (PST) Received: from localhost ([162.211.125.117]) by smtp.gmail.com with ESMTPSA id q19sm17482229pfl.21.2017.01.20.06.37.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Jan 2017 06:37:03 -0800 (PST) From: Geliang Tang To: Alexander Aring , Jukka Rissanen , "David S. Miller" Cc: Geliang Tang , linux-bluetooth@vger.kernel.org, linux-wpan@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] 6lowpan: use rb_entry() Date: Fri, 20 Jan 2017 22:36:53 +0800 Message-Id: X-Mailer: git-send-email 2.9.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org To make the code clearer, use rb_entry() instead of container_of() to deal with rbtree. Signed-off-by: Geliang Tang --- net/6lowpan/nhc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/6lowpan/nhc.c b/net/6lowpan/nhc.c index 7008d53..4fa2fdd 100644 --- a/net/6lowpan/nhc.c +++ b/net/6lowpan/nhc.c @@ -27,8 +27,8 @@ static int lowpan_nhc_insert(struct lowpan_nhc *nhc) /* Figure out where to put new node */ while (*new) { - struct lowpan_nhc *this = container_of(*new, struct lowpan_nhc, - node); + struct lowpan_nhc *this = rb_entry(*new, struct lowpan_nhc, + node); int result, len_dif, len; len_dif = nhc->idlen - this->idlen; @@ -69,8 +69,8 @@ static struct lowpan_nhc *lowpan_nhc_by_nhcid(const struct sk_buff *skb) const u8 *nhcid_skb_ptr = skb->data; while (node) { - struct lowpan_nhc *nhc = container_of(node, struct lowpan_nhc, - node); + struct lowpan_nhc *nhc = rb_entry(node, struct lowpan_nhc, + node); u8 nhcid_skb_ptr_masked[LOWPAN_NHC_MAX_ID_LEN]; int result, i;