diff options
author | Martin Townsend <mtownsend1973@gmail.com> | 2014-10-23 10:40:56 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2014-10-27 10:51:16 -0400 |
commit | 01141234f237957ec962dda2f1ca89d9ef180884 (patch) | |
tree | 1ed206b2d4dd83f6514dd07e0cabbe345f22b375 /net | |
parent | 3c400b843d4c07703b68e91854bc395c95e4c51a (diff) |
ieee802154: 6lowpan: rename process_data and lowpan_process_data
As we have decouple decompression from data delivery we can now rename all
occurences of process_data in receive path.
Signed-off-by: Martin Townsend <mtownsend1973@gmail.com>
Acked-by: Alexander Aring <alex.aring@gmail.com>
Acked-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
-rw-r--r-- | net/6lowpan/iphc.c | 12 | ||||
-rw-r--r-- | net/bluetooth/6lowpan.c | 15 | ||||
-rw-r--r-- | net/ieee802154/6lowpan_rtnl.c | 15 |
3 files changed, 23 insertions, 19 deletions
diff --git a/net/6lowpan/iphc.c b/net/6lowpan/iphc.c index 45714fe885f0..73a7065f0c6b 100644 --- a/net/6lowpan/iphc.c +++ b/net/6lowpan/iphc.c | |||
@@ -301,10 +301,12 @@ err: | |||
301 | /* TTL uncompression values */ | 301 | /* TTL uncompression values */ |
302 | static const u8 lowpan_ttl_values[] = { 0, 1, 64, 255 }; | 302 | static const u8 lowpan_ttl_values[] = { 0, 1, 64, 255 }; |
303 | 303 | ||
304 | int lowpan_process_data(struct sk_buff *skb, struct net_device *dev, | 304 | int |
305 | const u8 *saddr, const u8 saddr_type, const u8 saddr_len, | 305 | lowpan_header_decompress(struct sk_buff *skb, struct net_device *dev, |
306 | const u8 *daddr, const u8 daddr_type, const u8 daddr_len, | 306 | const u8 *saddr, const u8 saddr_type, |
307 | u8 iphc0, u8 iphc1) | 307 | const u8 saddr_len, const u8 *daddr, |
308 | const u8 daddr_type, const u8 daddr_len, | ||
309 | u8 iphc0, u8 iphc1) | ||
308 | { | 310 | { |
309 | struct ipv6hdr hdr = {}; | 311 | struct ipv6hdr hdr = {}; |
310 | u8 tmp, num_context = 0; | 312 | u8 tmp, num_context = 0; |
@@ -480,7 +482,7 @@ drop: | |||
480 | kfree_skb(skb); | 482 | kfree_skb(skb); |
481 | return -EINVAL; | 483 | return -EINVAL; |
482 | } | 484 | } |
483 | EXPORT_SYMBOL_GPL(lowpan_process_data); | 485 | EXPORT_SYMBOL_GPL(lowpan_header_decompress); |
484 | 486 | ||
485 | static u8 lowpan_compress_addr_64(u8 **hc_ptr, u8 shift, | 487 | static u8 lowpan_compress_addr_64(u8 **hc_ptr, u8 shift, |
486 | const struct in6_addr *ipaddr, | 488 | const struct in6_addr *ipaddr, |
diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c index 40e2cec7fcef..aa6ebbfc5d31 100644 --- a/net/bluetooth/6lowpan.c +++ b/net/bluetooth/6lowpan.c | |||
@@ -257,8 +257,8 @@ static int give_skb_to_upper(struct sk_buff *skb, struct net_device *dev) | |||
257 | return netif_rx(skb_cp); | 257 | return netif_rx(skb_cp); |
258 | } | 258 | } |
259 | 259 | ||
260 | static int process_data(struct sk_buff *skb, struct net_device *netdev, | 260 | static int iphc_decompress(struct sk_buff *skb, struct net_device *netdev, |
261 | struct l2cap_chan *chan) | 261 | struct l2cap_chan *chan) |
262 | { | 262 | { |
263 | const u8 *saddr, *daddr; | 263 | const u8 *saddr, *daddr; |
264 | u8 iphc0, iphc1; | 264 | u8 iphc0, iphc1; |
@@ -287,10 +287,11 @@ static int process_data(struct sk_buff *skb, struct net_device *netdev, | |||
287 | if (lowpan_fetch_skb_u8(skb, &iphc1)) | 287 | if (lowpan_fetch_skb_u8(skb, &iphc1)) |
288 | goto drop; | 288 | goto drop; |
289 | 289 | ||
290 | return lowpan_process_data(skb, netdev, | 290 | return lowpan_header_decompress(skb, netdev, |
291 | saddr, IEEE802154_ADDR_LONG, EUI64_ADDR_LEN, | 291 | saddr, IEEE802154_ADDR_LONG, |
292 | daddr, IEEE802154_ADDR_LONG, EUI64_ADDR_LEN, | 292 | EUI64_ADDR_LEN, daddr, |
293 | iphc0, iphc1); | 293 | IEEE802154_ADDR_LONG, EUI64_ADDR_LEN, |
294 | iphc0, iphc1); | ||
294 | 295 | ||
295 | drop: | 296 | drop: |
296 | kfree_skb(skb); | 297 | kfree_skb(skb); |
@@ -346,7 +347,7 @@ static int recv_pkt(struct sk_buff *skb, struct net_device *dev, | |||
346 | if (!local_skb) | 347 | if (!local_skb) |
347 | goto drop; | 348 | goto drop; |
348 | 349 | ||
349 | ret = process_data(local_skb, dev, chan); | 350 | ret = iphc_decompress(local_skb, dev, chan); |
350 | if (ret < 0) | 351 | if (ret < 0) |
351 | goto drop; | 352 | goto drop; |
352 | 353 | ||
diff --git a/net/ieee802154/6lowpan_rtnl.c b/net/ieee802154/6lowpan_rtnl.c index 21742c827475..519a65452d90 100644 --- a/net/ieee802154/6lowpan_rtnl.c +++ b/net/ieee802154/6lowpan_rtnl.c | |||
@@ -166,7 +166,8 @@ static int lowpan_give_skb_to_devices(struct sk_buff *skb, | |||
166 | return stat; | 166 | return stat; |
167 | } | 167 | } |
168 | 168 | ||
169 | static int process_data(struct sk_buff *skb, const struct ieee802154_hdr *hdr) | 169 | static int |
170 | iphc_decompress(struct sk_buff *skb, const struct ieee802154_hdr *hdr) | ||
170 | { | 171 | { |
171 | u8 iphc0, iphc1; | 172 | u8 iphc0, iphc1; |
172 | struct ieee802154_addr_sa sa, da; | 173 | struct ieee802154_addr_sa sa, da; |
@@ -196,9 +197,9 @@ static int process_data(struct sk_buff *skb, const struct ieee802154_hdr *hdr) | |||
196 | else | 197 | else |
197 | dap = &da.hwaddr; | 198 | dap = &da.hwaddr; |
198 | 199 | ||
199 | return lowpan_process_data(skb, skb->dev, sap, sa.addr_type, | 200 | return lowpan_header_decompress(skb, skb->dev, sap, sa.addr_type, |
200 | IEEE802154_ADDR_LEN, dap, da.addr_type, | 201 | IEEE802154_ADDR_LEN, dap, da.addr_type, |
201 | IEEE802154_ADDR_LEN, iphc0, iphc1); | 202 | IEEE802154_ADDR_LEN, iphc0, iphc1); |
202 | 203 | ||
203 | drop: | 204 | drop: |
204 | kfree_skb(skb); | 205 | kfree_skb(skb); |
@@ -541,7 +542,7 @@ static int lowpan_rcv(struct sk_buff *skb, struct net_device *dev, | |||
541 | } else { | 542 | } else { |
542 | switch (skb->data[0] & 0xe0) { | 543 | switch (skb->data[0] & 0xe0) { |
543 | case LOWPAN_DISPATCH_IPHC: /* ipv6 datagram */ | 544 | case LOWPAN_DISPATCH_IPHC: /* ipv6 datagram */ |
544 | ret = process_data(skb, &hdr); | 545 | ret = iphc_decompress(skb, &hdr); |
545 | if (ret < 0) | 546 | if (ret < 0) |
546 | goto drop; | 547 | goto drop; |
547 | 548 | ||
@@ -549,7 +550,7 @@ static int lowpan_rcv(struct sk_buff *skb, struct net_device *dev, | |||
549 | case LOWPAN_DISPATCH_FRAG1: /* first fragment header */ | 550 | case LOWPAN_DISPATCH_FRAG1: /* first fragment header */ |
550 | ret = lowpan_frag_rcv(skb, LOWPAN_DISPATCH_FRAG1); | 551 | ret = lowpan_frag_rcv(skb, LOWPAN_DISPATCH_FRAG1); |
551 | if (ret == 1) { | 552 | if (ret == 1) { |
552 | ret = process_data(skb, &hdr); | 553 | ret = iphc_decompress(skb, &hdr); |
553 | if (ret < 0) | 554 | if (ret < 0) |
554 | goto drop; | 555 | goto drop; |
555 | 556 | ||
@@ -562,7 +563,7 @@ static int lowpan_rcv(struct sk_buff *skb, struct net_device *dev, | |||
562 | case LOWPAN_DISPATCH_FRAGN: /* next fragments headers */ | 563 | case LOWPAN_DISPATCH_FRAGN: /* next fragments headers */ |
563 | ret = lowpan_frag_rcv(skb, LOWPAN_DISPATCH_FRAGN); | 564 | ret = lowpan_frag_rcv(skb, LOWPAN_DISPATCH_FRAGN); |
564 | if (ret == 1) { | 565 | if (ret == 1) { |
565 | ret = process_data(skb, &hdr); | 566 | ret = iphc_decompress(skb, &hdr); |
566 | if (ret < 0) | 567 | if (ret < 0) |
567 | goto drop; | 568 | goto drop; |
568 | 569 | ||