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>
This commit is contained in:

committed by
Marcel Holtmann

parent
3c400b843d
commit
01141234f2
@@ -257,8 +257,8 @@ static int give_skb_to_upper(struct sk_buff *skb, struct net_device *dev)
|
||||
return netif_rx(skb_cp);
|
||||
}
|
||||
|
||||
static int process_data(struct sk_buff *skb, struct net_device *netdev,
|
||||
struct l2cap_chan *chan)
|
||||
static int iphc_decompress(struct sk_buff *skb, struct net_device *netdev,
|
||||
struct l2cap_chan *chan)
|
||||
{
|
||||
const u8 *saddr, *daddr;
|
||||
u8 iphc0, iphc1;
|
||||
@@ -287,10 +287,11 @@ static int process_data(struct sk_buff *skb, struct net_device *netdev,
|
||||
if (lowpan_fetch_skb_u8(skb, &iphc1))
|
||||
goto drop;
|
||||
|
||||
return lowpan_process_data(skb, netdev,
|
||||
saddr, IEEE802154_ADDR_LONG, EUI64_ADDR_LEN,
|
||||
daddr, IEEE802154_ADDR_LONG, EUI64_ADDR_LEN,
|
||||
iphc0, iphc1);
|
||||
return lowpan_header_decompress(skb, netdev,
|
||||
saddr, IEEE802154_ADDR_LONG,
|
||||
EUI64_ADDR_LEN, daddr,
|
||||
IEEE802154_ADDR_LONG, EUI64_ADDR_LEN,
|
||||
iphc0, iphc1);
|
||||
|
||||
drop:
|
||||
kfree_skb(skb);
|
||||
@@ -346,7 +347,7 @@ static int recv_pkt(struct sk_buff *skb, struct net_device *dev,
|
||||
if (!local_skb)
|
||||
goto drop;
|
||||
|
||||
ret = process_data(local_skb, dev, chan);
|
||||
ret = iphc_decompress(local_skb, dev, chan);
|
||||
if (ret < 0)
|
||||
goto drop;
|
||||
|
||||
|
Reference in New Issue
Block a user