فهرست منبع

mac802154: cleanup ieee802154_netdev_to_extended_addr

This patch cleanups the ieee802154_be64_to_le64 to have a similar
function like ieee802154_le64_to_be64 only with switched source and
destionation types.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Alexander Aring 10 سال پیش
والد
کامیت
705cbbbe9c
2فایلهای تغییر یافته به همراه8 افزوده شده و 5 حذف شده
  1. 7 4
      include/net/mac802154.h
  2. 1 1
      net/mac802154/iface.c

+ 7 - 4
include/net/mac802154.h

@@ -224,12 +224,15 @@ struct ieee802154_ops {
 };
 };
 
 
 /**
 /**
- * ieee802154_netdev_to_extended_addr - convert big endian 64 byte void pointer to __le64
- * @dev_addr: big endian address pointer like netdevice dev_addr attribute
+ * ieee802154_be64_to_le64 - copies and convert be64 to le64
+ * @le64_dst: le64 destination pointer
+ * @be64_src: be64 source pointer
  */
  */
-static inline __le64 ieee802154_netdev_to_extended_addr(const void *dev_addr)
+static inline void ieee802154_be64_to_le64(void *le64_dst, const void *be64_src)
 {
 {
-	return (__force __le64)swab64p(dev_addr);
+	__le64 tmp = (__force __le64)swab64p(be64_src);
+
+	memcpy(le64_dst, &tmp, IEEE802154_EXTENDED_ADDR_LEN);
 }
 }
 
 
 /**
 /**

+ 1 - 1
net/mac802154/iface.c

@@ -117,7 +117,7 @@ static int mac802154_wpan_mac_addr(struct net_device *dev, void *p)
 	if (netif_running(dev))
 	if (netif_running(dev))
 		return -EBUSY;
 		return -EBUSY;
 
 
-	extended_addr = ieee802154_netdev_to_extended_addr(addr->sa_data);
+	ieee802154_be64_to_le64(&extended_addr, addr->sa_data);
 	if (!ieee802154_is_valid_extended_addr(extended_addr))
 	if (!ieee802154_is_valid_extended_addr(extended_addr))
 		return -EINVAL;
 		return -EINVAL;