Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'ieee802154-for-net-next-2022-06-09' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan-next

Stefan Schmidt says:

====================
pull-request: ieee802154-next 2022-06-09

This is a separate pull request for 6lowpan changes. We agreed with the
bluetooth maintainers to switch the trees these changing are going into
from bluetooth to ieee802154.

Jukka Rissanen stepped down as a co-maintainer of 6lowpan (Thanks for the
work!). Alexander is staying as maintainer.

Alexander reworked the nhc_id lookup in 6lowpan to be way simpler.
Moved the data structure from rb to an array, which is all we need in this
case.

* tag 'ieee802154-for-net-next-2022-06-09' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan-next:
MAINTAINERS: Remove Jukka Rissanen as 6lowpan maintainer
net: 6lowpan: constify lowpan_nhc structures
net: 6lowpan: use array for find nhc id
net: 6lowpan: remove const from scalars
====================

Link: https://lore.kernel.org/r/20220609202956.1512156-1-stefan@datenfreihafen.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

+48 -215
-1
MAINTAINERS
··· 171 171 172 172 6LOWPAN GENERIC (BTLE/IEEE 802.15.4) 173 173 M: Alexander Aring <alex.aring@gmail.com> 174 - M: Jukka Rissanen <jukka.rissanen@linux.intel.com> 175 174 L: linux-bluetooth@vger.kernel.org 176 175 L: linux-wpan@vger.kernel.org 177 176 S: Maintained
+19 -84
net/6lowpan/nhc.c
··· 12 12 13 13 #include "nhc.h" 14 14 15 - static struct rb_root rb_root = RB_ROOT; 16 - static struct lowpan_nhc *lowpan_nexthdr_nhcs[NEXTHDR_MAX + 1]; 15 + static const struct lowpan_nhc *lowpan_nexthdr_nhcs[NEXTHDR_MAX + 1]; 17 16 static DEFINE_SPINLOCK(lowpan_nhc_lock); 18 17 19 - static int lowpan_nhc_insert(struct lowpan_nhc *nhc) 18 + static const struct lowpan_nhc *lowpan_nhc_by_nhcid(struct sk_buff *skb) 20 19 { 21 - struct rb_node **new = &rb_root.rb_node, *parent = NULL; 20 + const struct lowpan_nhc *nhc; 21 + int i; 22 + u8 id; 22 23 23 - /* Figure out where to put new node */ 24 - while (*new) { 25 - struct lowpan_nhc *this = rb_entry(*new, struct lowpan_nhc, 26 - node); 27 - int result, len_dif, len; 24 + if (!pskb_may_pull(skb, 1)) 25 + return NULL; 28 26 29 - len_dif = nhc->idlen - this->idlen; 27 + id = *skb->data; 30 28 31 - if (nhc->idlen < this->idlen) 32 - len = nhc->idlen; 33 - else 34 - len = this->idlen; 29 + for (i = 0; i < NEXTHDR_MAX + 1; i++) { 30 + nhc = lowpan_nexthdr_nhcs[i]; 31 + if (!nhc) 32 + continue; 35 33 36 - result = memcmp(nhc->id, this->id, len); 37 - if (!result) 38 - result = len_dif; 39 - 40 - parent = *new; 41 - if (result < 0) 42 - new = &((*new)->rb_left); 43 - else if (result > 0) 44 - new = &((*new)->rb_right); 45 - else 46 - return -EEXIST; 47 - } 48 - 49 - /* Add new node and rebalance tree. */ 50 - rb_link_node(&nhc->node, parent, new); 51 - rb_insert_color(&nhc->node, &rb_root); 52 - 53 - return 0; 54 - } 55 - 56 - static void lowpan_nhc_remove(struct lowpan_nhc *nhc) 57 - { 58 - rb_erase(&nhc->node, &rb_root); 59 - } 60 - 61 - static struct lowpan_nhc *lowpan_nhc_by_nhcid(const struct sk_buff *skb) 62 - { 63 - struct rb_node *node = rb_root.rb_node; 64 - const u8 *nhcid_skb_ptr = skb->data; 65 - 66 - while (node) { 67 - struct lowpan_nhc *nhc = rb_entry(node, struct lowpan_nhc, 68 - node); 69 - u8 nhcid_skb_ptr_masked[LOWPAN_NHC_MAX_ID_LEN]; 70 - int result, i; 71 - 72 - if (nhcid_skb_ptr + nhc->idlen > skb->data + skb->len) 73 - return NULL; 74 - 75 - /* copy and mask afterwards the nhid value from skb */ 76 - memcpy(nhcid_skb_ptr_masked, nhcid_skb_ptr, nhc->idlen); 77 - for (i = 0; i < nhc->idlen; i++) 78 - nhcid_skb_ptr_masked[i] &= nhc->idmask[i]; 79 - 80 - result = memcmp(nhcid_skb_ptr_masked, nhc->id, nhc->idlen); 81 - if (result < 0) 82 - node = node->rb_left; 83 - else if (result > 0) 84 - node = node->rb_right; 85 - else 34 + if ((id & nhc->idmask) == nhc->id) 86 35 return nhc; 87 36 } 88 37 ··· 41 92 int lowpan_nhc_check_compression(struct sk_buff *skb, 42 93 const struct ipv6hdr *hdr, u8 **hc_ptr) 43 94 { 44 - struct lowpan_nhc *nhc; 95 + const struct lowpan_nhc *nhc; 45 96 int ret = 0; 46 97 47 98 spin_lock_bh(&lowpan_nhc_lock); ··· 59 110 u8 **hc_ptr) 60 111 { 61 112 int ret; 62 - struct lowpan_nhc *nhc; 113 + const struct lowpan_nhc *nhc; 63 114 64 115 spin_lock_bh(&lowpan_nhc_lock); 65 116 ··· 102 153 const struct net_device *dev, 103 154 struct ipv6hdr *hdr) 104 155 { 105 - struct lowpan_nhc *nhc; 156 + const struct lowpan_nhc *nhc; 106 157 int ret; 107 158 108 159 spin_lock_bh(&lowpan_nhc_lock); ··· 138 189 return 0; 139 190 } 140 191 141 - int lowpan_nhc_add(struct lowpan_nhc *nhc) 192 + int lowpan_nhc_add(const struct lowpan_nhc *nhc) 142 193 { 143 - int ret; 144 - 145 - if (!nhc->idlen || !nhc->idsetup) 146 - return -EINVAL; 147 - 148 - WARN_ONCE(nhc->idlen > LOWPAN_NHC_MAX_ID_LEN, 149 - "LOWPAN_NHC_MAX_ID_LEN should be updated to %zd.\n", 150 - nhc->idlen); 151 - 152 - nhc->idsetup(nhc); 194 + int ret = 0; 153 195 154 196 spin_lock_bh(&lowpan_nhc_lock); 155 197 ··· 149 209 goto out; 150 210 } 151 211 152 - ret = lowpan_nhc_insert(nhc); 153 - if (ret < 0) 154 - goto out; 155 - 156 212 lowpan_nexthdr_nhcs[nhc->nexthdr] = nhc; 157 213 out: 158 214 spin_unlock_bh(&lowpan_nhc_lock); ··· 156 220 } 157 221 EXPORT_SYMBOL(lowpan_nhc_add); 158 222 159 - void lowpan_nhc_del(struct lowpan_nhc *nhc) 223 + void lowpan_nhc_del(const struct lowpan_nhc *nhc) 160 224 { 161 225 spin_lock_bh(&lowpan_nhc_lock); 162 226 163 - lowpan_nhc_remove(nhc); 164 227 lowpan_nexthdr_nhcs[nhc->nexthdr] = NULL; 165 228 166 229 spin_unlock_bh(&lowpan_nhc_lock);
+14 -24
net/6lowpan/nhc.h
··· 16 16 * @_name: const char * of common header compression name. 17 17 * @_nexthdr: ipv6 nexthdr field for the header compression. 18 18 * @_nexthdrlen: ipv6 nexthdr len for the reserved space. 19 - * @_idsetup: callback to setup id and mask values. 20 - * @_idlen: len for the next header id and mask, should be always the same. 19 + * @_id: one byte nhc id value. 20 + * @_idmask: one byte nhc id mask value. 21 21 * @_uncompress: callback for uncompression call. 22 22 * @_compress: callback for compression call. 23 23 */ 24 24 #define LOWPAN_NHC(__nhc, _name, _nexthdr, \ 25 - _hdrlen, _idsetup, _idlen, \ 25 + _hdrlen, _id, _idmask, \ 26 26 _uncompress, _compress) \ 27 - static u8 __nhc##_val[_idlen]; \ 28 - static u8 __nhc##_mask[_idlen]; \ 29 - static struct lowpan_nhc __nhc = { \ 27 + static const struct lowpan_nhc __nhc = { \ 30 28 .name = _name, \ 31 29 .nexthdr = _nexthdr, \ 32 30 .nexthdrlen = _hdrlen, \ 33 - .id = __nhc##_val, \ 34 - .idmask = __nhc##_mask, \ 35 - .idlen = _idlen, \ 36 - .idsetup = _idsetup, \ 31 + .id = _id, \ 32 + .idmask = _idmask, \ 37 33 .uncompress = _uncompress, \ 38 34 .compress = _compress, \ 39 35 } ··· 49 53 /** 50 54 * struct lowpan_nhc - hold 6lowpan next hdr compression ifnformation 51 55 * 52 - * @node: holder for the rbtree. 53 56 * @name: name of the specific next header compression 54 57 * @nexthdr: next header value of the protocol which should be compressed. 55 58 * @nexthdrlen: ipv6 nexthdr len for the reserved space. 56 - * @id: array for nhc id. Note this need to be in network byteorder. 57 - * @mask: array for nhc id mask. Note this need to be in network byteorder. 58 - * @len: the length of the next header id and mask. 59 - * @setup: callback to setup fill the next header id value and mask. 59 + * @id: one byte nhc id value. 60 + * @idmask: one byte nhc id mask value. 60 61 * @compress: callback to do the header compression. 61 62 * @uncompress: callback to do the header uncompression. 62 63 */ 63 64 struct lowpan_nhc { 64 - struct rb_node node; 65 65 const char *name; 66 - const u8 nexthdr; 67 - const size_t nexthdrlen; 68 - u8 *id; 69 - u8 *idmask; 70 - const size_t idlen; 66 + u8 nexthdr; 67 + size_t nexthdrlen; 68 + u8 id; 69 + u8 idmask; 71 70 72 - void (*idsetup)(struct lowpan_nhc *nhc); 73 71 int (*uncompress)(struct sk_buff *skb, size_t needed); 74 72 int (*compress)(struct sk_buff *skb, u8 **hc_ptr); 75 73 }; ··· 116 126 * 117 127 * @nhc: nhc which should be add. 118 128 */ 119 - int lowpan_nhc_add(struct lowpan_nhc *nhc); 129 + int lowpan_nhc_add(const struct lowpan_nhc *nhc); 120 130 121 131 /** 122 132 * lowpan_nhc_del - delete a next header compression from framework 123 133 * 124 134 * @nhc: nhc which should be delete. 125 135 */ 126 - void lowpan_nhc_del(struct lowpan_nhc *nhc); 136 + void lowpan_nhc_del(const struct lowpan_nhc *nhc); 127 137 128 138 /** 129 139 * lowpan_nhc_init - adding all default nhcs
+1 -8
net/6lowpan/nhc_dest.c
··· 6 6 7 7 #include "nhc.h" 8 8 9 - #define LOWPAN_NHC_DEST_IDLEN 1 10 9 #define LOWPAN_NHC_DEST_ID_0 0xe6 11 10 #define LOWPAN_NHC_DEST_MASK_0 0xfe 12 11 13 - static void dest_nhid_setup(struct lowpan_nhc *nhc) 14 - { 15 - nhc->id[0] = LOWPAN_NHC_DEST_ID_0; 16 - nhc->idmask[0] = LOWPAN_NHC_DEST_MASK_0; 17 - } 18 - 19 12 LOWPAN_NHC(nhc_dest, "RFC6282 Destination Options", NEXTHDR_DEST, 0, 20 - dest_nhid_setup, LOWPAN_NHC_DEST_IDLEN, NULL, NULL); 13 + LOWPAN_NHC_DEST_ID_0, LOWPAN_NHC_DEST_MASK_0, NULL, NULL); 21 14 22 15 module_lowpan_nhc(nhc_dest); 23 16 MODULE_DESCRIPTION("6LoWPAN next header RFC6282 Destination Options compression");
+1 -8
net/6lowpan/nhc_fragment.c
··· 5 5 6 6 #include "nhc.h" 7 7 8 - #define LOWPAN_NHC_FRAGMENT_IDLEN 1 9 8 #define LOWPAN_NHC_FRAGMENT_ID_0 0xe4 10 9 #define LOWPAN_NHC_FRAGMENT_MASK_0 0xfe 11 10 12 - static void fragment_nhid_setup(struct lowpan_nhc *nhc) 13 - { 14 - nhc->id[0] = LOWPAN_NHC_FRAGMENT_ID_0; 15 - nhc->idmask[0] = LOWPAN_NHC_FRAGMENT_MASK_0; 16 - } 17 - 18 11 LOWPAN_NHC(nhc_fragment, "RFC6282 Fragment", NEXTHDR_FRAGMENT, 0, 19 - fragment_nhid_setup, LOWPAN_NHC_FRAGMENT_IDLEN, NULL, NULL); 12 + LOWPAN_NHC_FRAGMENT_ID_0, LOWPAN_NHC_FRAGMENT_MASK_0, NULL, NULL); 20 13 21 14 module_lowpan_nhc(nhc_fragment); 22 15 MODULE_DESCRIPTION("6LoWPAN next header RFC6282 Fragment compression");
+1 -8
net/6lowpan/nhc_ghc_ext_dest.c
··· 5 5 6 6 #include "nhc.h" 7 7 8 - #define LOWPAN_GHC_EXT_DEST_IDLEN 1 9 8 #define LOWPAN_GHC_EXT_DEST_ID_0 0xb6 10 9 #define LOWPAN_GHC_EXT_DEST_MASK_0 0xfe 11 10 12 - static void dest_ghid_setup(struct lowpan_nhc *nhc) 13 - { 14 - nhc->id[0] = LOWPAN_GHC_EXT_DEST_ID_0; 15 - nhc->idmask[0] = LOWPAN_GHC_EXT_DEST_MASK_0; 16 - } 17 - 18 11 LOWPAN_NHC(ghc_ext_dest, "RFC7400 Destination Extension Header", NEXTHDR_DEST, 19 - 0, dest_ghid_setup, LOWPAN_GHC_EXT_DEST_IDLEN, NULL, NULL); 12 + 0, LOWPAN_GHC_EXT_DEST_ID_0, LOWPAN_GHC_EXT_DEST_MASK_0, NULL, NULL); 20 13 21 14 module_lowpan_nhc(ghc_ext_dest); 22 15 MODULE_DESCRIPTION("6LoWPAN generic header destination extension compression");
+2 -9
net/6lowpan/nhc_ghc_ext_frag.c
··· 5 5 6 6 #include "nhc.h" 7 7 8 - #define LOWPAN_GHC_EXT_FRAG_IDLEN 1 9 8 #define LOWPAN_GHC_EXT_FRAG_ID_0 0xb4 10 9 #define LOWPAN_GHC_EXT_FRAG_MASK_0 0xfe 11 10 12 - static void frag_ghid_setup(struct lowpan_nhc *nhc) 13 - { 14 - nhc->id[0] = LOWPAN_GHC_EXT_FRAG_ID_0; 15 - nhc->idmask[0] = LOWPAN_GHC_EXT_FRAG_MASK_0; 16 - } 17 - 18 11 LOWPAN_NHC(ghc_ext_frag, "RFC7400 Fragmentation Extension Header", 19 - NEXTHDR_FRAGMENT, 0, frag_ghid_setup, 20 - LOWPAN_GHC_EXT_FRAG_IDLEN, NULL, NULL); 12 + NEXTHDR_FRAGMENT, 0, LOWPAN_GHC_EXT_FRAG_ID_0, 13 + LOWPAN_GHC_EXT_FRAG_MASK_0, NULL, NULL); 21 14 22 15 module_lowpan_nhc(ghc_ext_frag); 23 16 MODULE_DESCRIPTION("6LoWPAN generic header fragmentation extension compression");
+1 -8
net/6lowpan/nhc_ghc_ext_hop.c
··· 5 5 6 6 #include "nhc.h" 7 7 8 - #define LOWPAN_GHC_EXT_HOP_IDLEN 1 9 8 #define LOWPAN_GHC_EXT_HOP_ID_0 0xb0 10 9 #define LOWPAN_GHC_EXT_HOP_MASK_0 0xfe 11 10 12 - static void hop_ghid_setup(struct lowpan_nhc *nhc) 13 - { 14 - nhc->id[0] = LOWPAN_GHC_EXT_HOP_ID_0; 15 - nhc->idmask[0] = LOWPAN_GHC_EXT_HOP_MASK_0; 16 - } 17 - 18 11 LOWPAN_NHC(ghc_ext_hop, "RFC7400 Hop-by-Hop Extension Header", NEXTHDR_HOP, 0, 19 - hop_ghid_setup, LOWPAN_GHC_EXT_HOP_IDLEN, NULL, NULL); 12 + LOWPAN_GHC_EXT_HOP_ID_0, LOWPAN_GHC_EXT_HOP_MASK_0, NULL, NULL); 20 13 21 14 module_lowpan_nhc(ghc_ext_hop); 22 15 MODULE_DESCRIPTION("6LoWPAN generic header hop-by-hop extension compression");
+1 -8
net/6lowpan/nhc_ghc_ext_route.c
··· 5 5 6 6 #include "nhc.h" 7 7 8 - #define LOWPAN_GHC_EXT_ROUTE_IDLEN 1 9 8 #define LOWPAN_GHC_EXT_ROUTE_ID_0 0xb2 10 9 #define LOWPAN_GHC_EXT_ROUTE_MASK_0 0xfe 11 10 12 - static void route_ghid_setup(struct lowpan_nhc *nhc) 13 - { 14 - nhc->id[0] = LOWPAN_GHC_EXT_ROUTE_ID_0; 15 - nhc->idmask[0] = LOWPAN_GHC_EXT_ROUTE_MASK_0; 16 - } 17 - 18 11 LOWPAN_NHC(ghc_ext_route, "RFC7400 Routing Extension Header", NEXTHDR_ROUTING, 19 - 0, route_ghid_setup, LOWPAN_GHC_EXT_ROUTE_IDLEN, NULL, NULL); 12 + 0, LOWPAN_GHC_EXT_ROUTE_ID_0, LOWPAN_GHC_EXT_ROUTE_MASK_0, NULL, NULL); 20 13 21 14 module_lowpan_nhc(ghc_ext_route); 22 15 MODULE_DESCRIPTION("6LoWPAN generic header routing extension compression");
+1 -8
net/6lowpan/nhc_ghc_icmpv6.c
··· 5 5 6 6 #include "nhc.h" 7 7 8 - #define LOWPAN_GHC_ICMPV6_IDLEN 1 9 8 #define LOWPAN_GHC_ICMPV6_ID_0 0xdf 10 9 #define LOWPAN_GHC_ICMPV6_MASK_0 0xff 11 10 12 - static void icmpv6_ghid_setup(struct lowpan_nhc *nhc) 13 - { 14 - nhc->id[0] = LOWPAN_GHC_ICMPV6_ID_0; 15 - nhc->idmask[0] = LOWPAN_GHC_ICMPV6_MASK_0; 16 - } 17 - 18 11 LOWPAN_NHC(ghc_icmpv6, "RFC7400 ICMPv6", NEXTHDR_ICMP, 0, 19 - icmpv6_ghid_setup, LOWPAN_GHC_ICMPV6_IDLEN, NULL, NULL); 12 + LOWPAN_GHC_ICMPV6_ID_0, LOWPAN_GHC_ICMPV6_MASK_0, NULL, NULL); 20 13 21 14 module_lowpan_nhc(ghc_icmpv6); 22 15 MODULE_DESCRIPTION("6LoWPAN generic header ICMPv6 compression");
+1 -8
net/6lowpan/nhc_ghc_udp.c
··· 5 5 6 6 #include "nhc.h" 7 7 8 - #define LOWPAN_GHC_UDP_IDLEN 1 9 8 #define LOWPAN_GHC_UDP_ID_0 0xd0 10 9 #define LOWPAN_GHC_UDP_MASK_0 0xf8 11 10 12 - static void udp_ghid_setup(struct lowpan_nhc *nhc) 13 - { 14 - nhc->id[0] = LOWPAN_GHC_UDP_ID_0; 15 - nhc->idmask[0] = LOWPAN_GHC_UDP_MASK_0; 16 - } 17 - 18 11 LOWPAN_NHC(ghc_udp, "RFC7400 UDP", NEXTHDR_UDP, 0, 19 - udp_ghid_setup, LOWPAN_GHC_UDP_IDLEN, NULL, NULL); 12 + LOWPAN_GHC_UDP_ID_0, LOWPAN_GHC_UDP_MASK_0, NULL, NULL); 20 13 21 14 module_lowpan_nhc(ghc_udp); 22 15 MODULE_DESCRIPTION("6LoWPAN generic header UDP compression");
+1 -8
net/6lowpan/nhc_hop.c
··· 5 5 6 6 #include "nhc.h" 7 7 8 - #define LOWPAN_NHC_HOP_IDLEN 1 9 8 #define LOWPAN_NHC_HOP_ID_0 0xe0 10 9 #define LOWPAN_NHC_HOP_MASK_0 0xfe 11 10 12 - static void hop_nhid_setup(struct lowpan_nhc *nhc) 13 - { 14 - nhc->id[0] = LOWPAN_NHC_HOP_ID_0; 15 - nhc->idmask[0] = LOWPAN_NHC_HOP_MASK_0; 16 - } 17 - 18 11 LOWPAN_NHC(nhc_hop, "RFC6282 Hop-by-Hop Options", NEXTHDR_HOP, 0, 19 - hop_nhid_setup, LOWPAN_NHC_HOP_IDLEN, NULL, NULL); 12 + LOWPAN_NHC_HOP_ID_0, LOWPAN_NHC_HOP_MASK_0, NULL, NULL); 20 13 21 14 module_lowpan_nhc(nhc_hop); 22 15 MODULE_DESCRIPTION("6LoWPAN next header RFC6282 Hop-by-Hop Options compression");
+2 -9
net/6lowpan/nhc_ipv6.c
··· 5 5 6 6 #include "nhc.h" 7 7 8 - #define LOWPAN_NHC_IPV6_IDLEN 1 9 8 #define LOWPAN_NHC_IPV6_ID_0 0xee 10 9 #define LOWPAN_NHC_IPV6_MASK_0 0xfe 11 10 12 - static void ipv6_nhid_setup(struct lowpan_nhc *nhc) 13 - { 14 - nhc->id[0] = LOWPAN_NHC_IPV6_ID_0; 15 - nhc->idmask[0] = LOWPAN_NHC_IPV6_MASK_0; 16 - } 17 - 18 - LOWPAN_NHC(nhc_ipv6, "RFC6282 IPv6", NEXTHDR_IPV6, 0, ipv6_nhid_setup, 19 - LOWPAN_NHC_IPV6_IDLEN, NULL, NULL); 11 + LOWPAN_NHC(nhc_ipv6, "RFC6282 IPv6", NEXTHDR_IPV6, 0, LOWPAN_NHC_IPV6_ID_0, 12 + LOWPAN_NHC_IPV6_MASK_0, NULL, NULL); 20 13 21 14 module_lowpan_nhc(nhc_ipv6); 22 15 MODULE_DESCRIPTION("6LoWPAN next header RFC6282 IPv6 compression");
+1 -8
net/6lowpan/nhc_mobility.c
··· 5 5 6 6 #include "nhc.h" 7 7 8 - #define LOWPAN_NHC_MOBILITY_IDLEN 1 9 8 #define LOWPAN_NHC_MOBILITY_ID_0 0xe8 10 9 #define LOWPAN_NHC_MOBILITY_MASK_0 0xfe 11 10 12 - static void mobility_nhid_setup(struct lowpan_nhc *nhc) 13 - { 14 - nhc->id[0] = LOWPAN_NHC_MOBILITY_ID_0; 15 - nhc->idmask[0] = LOWPAN_NHC_MOBILITY_MASK_0; 16 - } 17 - 18 11 LOWPAN_NHC(nhc_mobility, "RFC6282 Mobility", NEXTHDR_MOBILITY, 0, 19 - mobility_nhid_setup, LOWPAN_NHC_MOBILITY_IDLEN, NULL, NULL); 12 + LOWPAN_NHC_MOBILITY_ID_0, LOWPAN_NHC_MOBILITY_MASK_0, NULL, NULL); 20 13 21 14 module_lowpan_nhc(nhc_mobility); 22 15 MODULE_DESCRIPTION("6LoWPAN next header RFC6282 Mobility compression");
+1 -8
net/6lowpan/nhc_routing.c
··· 5 5 6 6 #include "nhc.h" 7 7 8 - #define LOWPAN_NHC_ROUTING_IDLEN 1 9 8 #define LOWPAN_NHC_ROUTING_ID_0 0xe2 10 9 #define LOWPAN_NHC_ROUTING_MASK_0 0xfe 11 10 12 - static void routing_nhid_setup(struct lowpan_nhc *nhc) 13 - { 14 - nhc->id[0] = LOWPAN_NHC_ROUTING_ID_0; 15 - nhc->idmask[0] = LOWPAN_NHC_ROUTING_MASK_0; 16 - } 17 - 18 11 LOWPAN_NHC(nhc_routing, "RFC6282 Routing", NEXTHDR_ROUTING, 0, 19 - routing_nhid_setup, LOWPAN_NHC_ROUTING_IDLEN, NULL, NULL); 12 + LOWPAN_NHC_ROUTING_ID_0, LOWPAN_NHC_ROUTING_MASK_0, NULL, NULL); 20 13 21 14 module_lowpan_nhc(nhc_routing); 22 15 MODULE_DESCRIPTION("6LoWPAN next header RFC6282 Routing compression");
+1 -8
net/6lowpan/nhc_udp.c
··· 14 14 15 15 #define LOWPAN_NHC_UDP_MASK 0xF8 16 16 #define LOWPAN_NHC_UDP_ID 0xF0 17 - #define LOWPAN_NHC_UDP_IDLEN 1 18 17 19 18 #define LOWPAN_NHC_UDP_4BIT_PORT 0xF0B0 20 19 #define LOWPAN_NHC_UDP_4BIT_MASK 0xFFF0 ··· 168 169 return 0; 169 170 } 170 171 171 - static void udp_nhid_setup(struct lowpan_nhc *nhc) 172 - { 173 - nhc->id[0] = LOWPAN_NHC_UDP_ID; 174 - nhc->idmask[0] = LOWPAN_NHC_UDP_MASK; 175 - } 176 - 177 172 LOWPAN_NHC(nhc_udp, "RFC6282 UDP", NEXTHDR_UDP, sizeof(struct udphdr), 178 - udp_nhid_setup, LOWPAN_NHC_UDP_IDLEN, udp_uncompress, udp_compress); 173 + LOWPAN_NHC_UDP_ID, LOWPAN_NHC_UDP_MASK, udp_uncompress, udp_compress); 179 174 180 175 module_lowpan_nhc(nhc_udp); 181 176 MODULE_DESCRIPTION("6LoWPAN next header RFC6282 UDP compression");