Merge tag 'nfc-next-4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo...

[mirror_ubuntu-hirsute-kernel.git] / net / ieee802154 / 6lowpan / 6lowpan_i.h

diff --git a/net/ieee802154/6lowpan/6lowpan_i.h b/net/ieee802154/6lowpan/6lowpan_i.h
index b4e17a7c0df0838f7aed6ac4fa4705a70699a7a8..5ac778962e4ee4895903f707c00d7750a104b3bd 100644 (file)
--- a/net/ieee802154/6lowpan/6lowpan_i.h
+++ b/net/ieee802154/6lowpan/6lowpan_i.h
@@ -41,24 +41,12 @@ static inline u32 ieee802154_addr_hash(const struct ieee802154_addr *a)
                return (((__force u64)a->extended_addr) >> 32) ^
                        (((__force u64)a->extended_addr) & 0xffffffff);
        case IEEE802154_ADDR_SHORT:
-               return (__force u32)(a->short_addr);
+               return (__force u32)(a->short_addr + (a->pan_id << 16));
        default:
                return 0;
        }
 }
 
-/* private device info */
-struct lowpan_dev_info {
-       struct net_device       *wdev; /* wpan device ptr */
-       u16                     fragment_tag;
-};
-
-static inline struct
-lowpan_dev_info *lowpan_dev_info(const struct net_device *dev)
-{
-       return (struct lowpan_dev_info *)lowpan_priv(dev)->priv;
-}
-
 int lowpan_frag_rcv(struct sk_buff *skb, const u8 frag_type);
 void lowpan_net_frag_exit(void);
 int lowpan_net_frag_init(void);