/* 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;
        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;