From 07e3bebfb62a670849f169965d1f8328360bfae6 Mon Sep 17 00:00:00 2001 From: gluker Date: Thu, 30 Mar 2023 15:51:10 +0300 Subject: [PATCH] Fix compiler warnings --- core/rtw_br_ext.c | 6 +++--- os_dep/linux/ioctl_linux.c | 2 +- os_dep/osdep_service.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/rtw_br_ext.c b/core/rtw_br_ext.c index 532d6b3..b47698f 100644 --- a/core/rtw_br_ext.c +++ b/core/rtw_br_ext.c @@ -102,7 +102,7 @@ static __inline__ unsigned char *__nat25_find_pppoe_tag(struct pppoe_hdr *ph, un } -static __inline__ int __nat25_add_pppoe_tag(struct sk_buff *skb, struct pppoe_tag *tag) +static __inline__ int __nat25_add_pppoe_tag(struct sk_buff *skb, struct pppoe_tag *tag, unsigned int tag_size) { struct pppoe_hdr *ph = (struct pppoe_hdr *)(skb->data + ETH_HLEN); int data_len; @@ -117,7 +117,7 @@ static __inline__ int __nat25_add_pppoe_tag(struct sk_buff *skb, struct pppoe_ta /* have a room for new tag */ memmove(((unsigned char *)ph->tag + data_len), (unsigned char *)ph->tag, ntohs(ph->length)); ph->length = htons(ntohs(ph->length) + data_len); - memcpy((unsigned char *)ph->tag, tag, data_len); + memcpy((unsigned char *)ph->tag, tag, (data_len > tag_size) ? tag_size : data_len); return data_len; } @@ -1167,7 +1167,7 @@ int nat25_db_handle(_adapter *priv, struct sk_buff *skb, int method) memcpy(tag->tag_data + MAGIC_CODE_LEN, skb->data + ETH_ALEN, ETH_ALEN); /* Add relay tag */ - if (__nat25_add_pppoe_tag(skb, tag) < 0) + if (__nat25_add_pppoe_tag(skb, tag, sizeof(tag_buf)) < 0) return -1; RTW_INFO("NAT25: Insert PPPoE, forward %s packet\n", diff --git a/os_dep/linux/ioctl_linux.c b/os_dep/linux/ioctl_linux.c index 35421a7..fbc162f 100644 --- a/os_dep/linux/ioctl_linux.c +++ b/os_dep/linux/ioctl_linux.c @@ -9789,7 +9789,7 @@ static int rtw_mp_efuse_set(struct net_device *dev, rtw_hal_read_chip_info(padapter); /* set mac addr*/ rtw_macaddr_cfg(adapter_mac_addr(padapter), get_hal_mac_addr(padapter)); - _rtw_memcpy(padapter->pnetdev->dev_addr, get_hal_mac_addr(padapter), ETH_ALEN); /* set mac addr to net_device */ + _rtw_memcpy((void *)padapter->pnetdev->dev_addr, get_hal_mac_addr(padapter), ETH_ALEN); /* set mac addr to net_device */ #ifdef CONFIG_P2P rtw_init_wifidirect_addrs(padapter, adapter_mac_addr(padapter), adapter_mac_addr(padapter)); diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c index dc43b81..9753ba4 100644 --- a/os_dep/osdep_service.c +++ b/os_dep/osdep_service.c @@ -2451,7 +2451,7 @@ int rtw_change_ifname(_adapter *padapter, const char *ifname) rtw_init_netdev_name(pnetdev, ifname); - _rtw_memcpy(pnetdev->dev_addr, adapter_mac_addr(padapter), ETH_ALEN); + _rtw_memcpy((void *)pnetdev->dev_addr, adapter_mac_addr(padapter), ETH_ALEN); if (rtnl_lock_needed) ret = register_netdev(pnetdev);