diff for duplicates of <20141008104014.GA23096@mwanda> diff --git a/a/1.txt b/N1/1.txt index e3c6630..6ce98b0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -31,7 +31,8 @@ index 3eb77de..c8f7890 100644 - ether_addr_copy(pwlanhdr->addr2, mac); + memcpy(pwlanhdr->addr2, mac, ETH_ALEN); - pwlanhdr->seq_ctrl cpu_to_le16(IEEE80211_SN_TO_SEQ(pmlmeext->mgnt_seq)); + pwlanhdr->seq_ctrl = + cpu_to_le16(IEEE80211_SN_TO_SEQ(pmlmeext->mgnt_seq)); @@ -2863,8 +2863,8 @@ static void issue_auth(struct rtw_adapter *padapter, struct sta_info *psta, #ifdef CONFIG_8723AU_AP_MODE unsigned short val16; @@ -78,7 +79,8 @@ index 3eb77de..c8f7890 100644 + memcpy(pwlanhdr->addr2, myid(&padapter->eeprompriv), ETH_ALEN); ether_addr_copy(pwlanhdr->addr3, get_my_bssid23a(&pmlmeinfo->network)); - pwlanhdr->seq_ctrl @@ -3528,7 +3528,7 @@ static int _issue_qos_nulldata23a(struct rtw_adapter *padapter, + pwlanhdr->seq_ctrl = +@@ -3528,7 +3528,7 @@ static int _issue_qos_nulldata23a(struct rtw_adapter *padapter, pwlanhdr->qos_ctrl |= cpu_to_le16(IEEE80211_QOS_CTL_EOSP); ether_addr_copy(pwlanhdr->addr1, da); @@ -86,7 +88,8 @@ index 3eb77de..c8f7890 100644 + memcpy(pwlanhdr->addr2, myid(&padapter->eeprompriv), ETH_ALEN); ether_addr_copy(pwlanhdr->addr3, get_my_bssid23a(&pmlmeinfo->network)); - pwlanhdr->seq_ctrl @@ -3633,7 +3633,7 @@ static int _issue_deauth(struct rtw_adapter *padapter, unsigned char *da, + pwlanhdr->seq_ctrl = +@@ -3633,7 +3633,7 @@ static int _issue_deauth(struct rtw_adapter *padapter, unsigned char *da, cpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_DEAUTH); ether_addr_copy(mgmt->da, da); @@ -131,7 +134,8 @@ index bd6953a..cb81e64 100644 --- a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c @@ -2414,7 +2414,7 @@ void rtw_cfg80211_indicate_sta_disassoc(struct rtw_adapter *padapter, - mgmt.frame_control cpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_DEAUTH); + mgmt.frame_control = + cpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_DEAUTH); - ether_addr_copy(mgmt.da, myid(&padapter->eeprompriv)); + memcpy(mgmt.da, myid(&padapter->eeprompriv), ETH_ALEN); diff --git a/a/content_digest b/N1/content_digest index b377258..12ccf1f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[patch] staging: rtl8723au: incorrect use of ether_addr_copy()\0" - "Date\0Wed, 08 Oct 2014 10:40:14 +0000\0" + "Date\0Wed, 8 Oct 2014 13:40:14 +0300\0" "To\0Larry Finger <Larry.Finger@lwfinger.net>\0" "Cc\0Jes Sorensen <Jes.Sorensen@redhat.com>" Greg Kroah-Hartman <gregkh@linuxfoundation.org> @@ -42,7 +42,8 @@ "-\tether_addr_copy(pwlanhdr->addr2, mac);\n" "+\tmemcpy(pwlanhdr->addr2, mac, ETH_ALEN);\n" " \n" - " \tpwlanhdr->seq_ctrl \t\tcpu_to_le16(IEEE80211_SN_TO_SEQ(pmlmeext->mgnt_seq));\n" + " \tpwlanhdr->seq_ctrl =\n" + " \t\tcpu_to_le16(IEEE80211_SN_TO_SEQ(pmlmeext->mgnt_seq));\n" "@@ -2863,8 +2863,8 @@ static void issue_auth(struct rtw_adapter *padapter, struct sta_info *psta,\n" " #ifdef CONFIG_8723AU_AP_MODE\n" " \t\tunsigned short val16;\n" @@ -89,7 +90,8 @@ "+\tmemcpy(pwlanhdr->addr2, myid(&padapter->eeprompriv), ETH_ALEN);\n" " \tether_addr_copy(pwlanhdr->addr3, get_my_bssid23a(&pmlmeinfo->network));\n" " \n" - " \tpwlanhdr->seq_ctrl @@ -3528,7 +3528,7 @@ static int _issue_qos_nulldata23a(struct rtw_adapter *padapter,\n" + " \tpwlanhdr->seq_ctrl =\n" + "@@ -3528,7 +3528,7 @@ static int _issue_qos_nulldata23a(struct rtw_adapter *padapter,\n" " \t\tpwlanhdr->qos_ctrl |= cpu_to_le16(IEEE80211_QOS_CTL_EOSP);\n" " \n" " \tether_addr_copy(pwlanhdr->addr1, da);\n" @@ -97,7 +99,8 @@ "+\tmemcpy(pwlanhdr->addr2, myid(&padapter->eeprompriv), ETH_ALEN);\n" " \tether_addr_copy(pwlanhdr->addr3, get_my_bssid23a(&pmlmeinfo->network));\n" " \n" - " \tpwlanhdr->seq_ctrl @@ -3633,7 +3633,7 @@ static int _issue_deauth(struct rtw_adapter *padapter, unsigned char *da,\n" + " \tpwlanhdr->seq_ctrl =\n" + "@@ -3633,7 +3633,7 @@ static int _issue_deauth(struct rtw_adapter *padapter, unsigned char *da,\n" " \t\tcpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_DEAUTH);\n" " \n" " \tether_addr_copy(mgmt->da, da);\n" @@ -142,11 +145,12 @@ "--- a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c\n" "+++ b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c\n" "@@ -2414,7 +2414,7 @@ void rtw_cfg80211_indicate_sta_disassoc(struct rtw_adapter *padapter,\n" - " \tmgmt.frame_control \t\tcpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_DEAUTH);\n" + " \tmgmt.frame_control =\n" + " \t\tcpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_DEAUTH);\n" " \n" "-\tether_addr_copy(mgmt.da, myid(&padapter->eeprompriv));\n" "+\tmemcpy(mgmt.da, myid(&padapter->eeprompriv), ETH_ALEN);\n" " \tether_addr_copy(mgmt.sa, da);\n" " \tether_addr_copy(mgmt.bssid, get_my_bssid23a(&pmlmeinfo->network));" -9fd6544ce0e400a7edc9a644a51fece60682488b49c038271758fc24c76b25cc +e2df5ddd13817d166b9a1fb14de0204475e6b2ab88d20337a9e9a98f26d68b83
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.