diff for duplicates of <wrfj4mvezmpm.fsf@redhat.com> diff --git a/a/1.txt b/N1/1.txt index 214ed23..1c2cb6d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -51,7 +51,8 @@ Jes > - 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; @@ -98,7 +99,8 @@ Jes > + 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); @@ -106,7 +108,8 @@ Jes > + 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); @@ -151,7 +154,8 @@ Jes > --- 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 9e79729..97571af 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020141008104014.GA23096@mwanda\0" "From\0Jes Sorensen <Jes.Sorensen@redhat.com>\0" "Subject\0Re: [patch] staging: rtl8723au: incorrect use of ether_addr_copy()\0" - "Date\0Wed, 08 Oct 2014 13:59:33 +0000\0" + "Date\0Wed, 08 Oct 2014 15:59:33 +0200\0" "To\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Cc\0Larry Finger <Larry.Finger@lwfinger.net>" Greg Kroah-Hartman <gregkh@linuxfoundation.org> @@ -63,7 +63,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" @@ -110,7 +111,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" @@ -118,7 +120,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" @@ -163,7 +166,8 @@ "> --- 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" @@ -171,4 +175,4 @@ "> \tether_addr_copy(mgmt.bssid, get_my_bssid23a(&pmlmeinfo->network));\n" > -794e06bf1c2f5169b14bf515c3c0410032c9b5869004121f6285c34bb98f2dce +c52cdd006dfd78c8b5d46473ab870d591d0d59478942bd23d336d9da0108e5f4
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.