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>

1 files changed, 8 insertions, 7 deletions

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,
         return stat;
 }
 
-static int process_data(struct sk_buff *skb, const struct ieee802154_hdr *hdr)
+static int
+iphc_decompress(struct sk_buff *skb, const struct ieee802154_hdr *hdr)
 {
         u8 iphc0, iphc1;
         struct ieee802154_addr_sa sa, da;
@@ -196,9 +197,9 @@ static int process_data(struct sk_buff *skb, const struct ieee802154_hdr *hdr)
         else
                 dap = &da.hwaddr;
 
-        return lowpan_process_data(skb, skb->dev, sap, sa.addr_type,
-                                   IEEE802154_ADDR_LEN, dap, da.addr_type,
-                                   IEEE802154_ADDR_LEN, iphc0, iphc1);
+        return lowpan_header_decompress(skb, skb->dev, sap, sa.addr_type,
+                                        IEEE802154_ADDR_LEN, dap, da.addr_type,
+                                        IEEE802154_ADDR_LEN, iphc0, iphc1);
 
 drop:
         kfree_skb(skb);
@@ -541,7 +542,7 @@ static int lowpan_rcv(struct sk_buff *skb, struct net_device *dev,
         } else {
                 switch (skb->data[0] & 0xe0) {
                 case LOWPAN_DISPATCH_IPHC:      /* ipv6 datagram */
-                        ret = process_data(skb, &hdr);
+                        ret = iphc_decompress(skb, &hdr);
                         if (ret < 0)
                                 goto drop;
 
@@ -549,7 +550,7 @@ static int lowpan_rcv(struct sk_buff *skb, struct net_device *dev,
                 case LOWPAN_DISPATCH_FRAG1:     /* first fragment header */
                         ret = lowpan_frag_rcv(skb, LOWPAN_DISPATCH_FRAG1);
                         if (ret == 1) {
-                                ret = process_data(skb, &hdr);
+                                ret = iphc_decompress(skb, &hdr);
                                 if (ret < 0)
                                         goto drop;
 
@@ -562,7 +563,7 @@ static int lowpan_rcv(struct sk_buff *skb, struct net_device *dev,
                 case LOWPAN_DISPATCH_FRAGN:     /* next fragments headers */
                         ret = lowpan_frag_rcv(skb, LOWPAN_DISPATCH_FRAGN);
                         if (ret == 1) {
-                                ret = process_data(skb, &hdr);
+                                ret = iphc_decompress(skb, &hdr);
                                 if (ret < 0)
                                         goto drop;