6lowpan: remove skb_deliver from IPHC

Separating skb delivery from decompression ensures that we can support further
decompression schemes and removes the mixed return value of error codes with
NET_RX_FOO.

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, 12 insertions, 2 deletions

diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c
index 6c5c2eff45bd..45d9a9fef634 100644
--- a/net/bluetooth/6lowpan.c
+++ b/net/bluetooth/6lowpan.c
@@ -252,7 +252,7 @@ static int give_skb_to_upper(struct sk_buff *skb, struct net_device *dev)
 
         skb_cp = skb_copy(skb, GFP_ATOMIC);
         if (!skb_cp)
-                return -ENOMEM;
+                return NET_RX_DROP;
 
         return netif_rx(skb_cp);
 }
@@ -290,7 +290,7 @@ static int process_data(struct sk_buff *skb, struct net_device *netdev,
         return lowpan_process_data(skb, netdev,
                                    saddr, IEEE802154_ADDR_LONG, EUI64_ADDR_LEN,
                                    daddr, IEEE802154_ADDR_LONG, EUI64_ADDR_LEN,
-                                   iphc0, iphc1, give_skb_to_upper);
+                                   iphc0, iphc1);
 
 drop:
         kfree_skb(skb);
@@ -350,6 +350,16 @@ static int recv_pkt(struct sk_buff *skb, struct net_device *dev,
                         if (ret != NET_RX_SUCCESS)
                                 goto drop;
 
+                        local_skb->protocol = htons(ETH_P_IPV6);
+                        local_skb->pkt_type = PACKET_HOST;
+                        local_skb->dev = dev;
+
+                        if (give_skb_to_upper(local_skb, dev)
+                                        != NET_RX_SUCCESS) {
+                                kfree_skb(local_skb);
+                                goto drop;
+                        }
+
                         dev->stats.rx_bytes += skb->len;
                         dev->stats.rx_packets++;