ieee802154: use ieee802154_addr instead of *_sa variants

Change all internal uses of ieee802154_addr_sa to ieee802154_addr,
except for those instances that communicate directly with userspace.

Signed-off-by: Phoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 11 insertions, 6 deletions

diff --git a/net/ieee802154/reassembly.c b/net/ieee802154/reassembly.c
index f08b37a24b1d..a2b9e4e533f8 100644
--- a/net/ieee802154/reassembly.c
+++ b/net/ieee802154/reassembly.c
@@ -36,8 +36,8 @@ static int lowpan_frag_reasm(struct lowpan_frag_queue *fq,
                              struct sk_buff *prev, struct net_device *dev);
 
 static unsigned int lowpan_hash_frag(__be16 tag, u16 d_size,
-                                     const struct ieee802154_addr_sa *saddr,
-                                     const struct ieee802154_addr_sa *daddr)
+                                     const struct ieee802154_addr *saddr,
+                                     const struct ieee802154_addr *daddr)
 {
         u32 c;
 
@@ -65,8 +65,8 @@ static bool lowpan_frag_match(struct inet_frag_queue *q, void *a)
 
         fq = container_of(q, struct lowpan_frag_queue, q);
         return  fq->tag == arg->tag && fq->d_size == arg->d_size &&
-                ieee802154_addr_addr_equal(&fq->saddr, arg->src) &&
-                ieee802154_addr_addr_equal(&fq->daddr, arg->dst);
+                ieee802154_addr_equal(&fq->saddr, arg->src) &&
+                ieee802154_addr_equal(&fq->daddr, arg->dst);
 }
 
 static void lowpan_frag_init(struct inet_frag_queue *q, void *a)
@@ -103,7 +103,8 @@ out:
 
 static inline struct lowpan_frag_queue *
 fq_find(struct net *net, const struct ieee802154_frag_info *frag_info,
-        const struct ieee802154_addr_sa *src, const struct ieee802154_addr_sa *dst)
+        const struct ieee802154_addr *src,
+        const struct ieee802154_addr *dst)
 {
         struct inet_frag_queue *q;
         struct lowpan_create_arg arg;
@@ -346,8 +347,12 @@ int lowpan_frag_rcv(struct sk_buff *skb, const u8 frag_type)
         struct lowpan_frag_queue *fq;
         struct net *net = dev_net(skb->dev);
         struct ieee802154_frag_info *frag_info = &mac_cb(skb)->frag_info;
+        struct ieee802154_addr source, dest;
         int err;
 
+        source = mac_cb(skb)->source;
+        dest = mac_cb(skb)->dest;
+
         err = lowpan_get_frag_info(skb, frag_type, frag_info);
         if (err < 0)
                 goto err;
@@ -357,7 +362,7 @@ int lowpan_frag_rcv(struct sk_buff *skb, const u8 frag_type)
 
         inet_frag_evictor(&net->ieee802154_lowpan.frags, &lowpan_frags, false);
 
-        fq = fq_find(net, frag_info, &mac_cb(skb)->sa, &mac_cb(skb)->da);
+        fq = fq_find(net, frag_info, &source, &dest);
         if (fq != NULL) {
                 int ret;
                 spin_lock(&fq->q.lock);