Merge pull request #122 from devang/master

indentation fixes and a misplaced semi-colon
This commit is contained in:
Ole Petter Bang 2017-10-02 08:08:57 +02:00 committed by GitHub
commit 190325a797
4 changed files with 10 additions and 11 deletions

View File

@ -5617,7 +5617,7 @@ unsigned int on_action_public_p2p(union recv_frame *precv_frame)
// Commented by Kurt 20120113
// Get peer_dev_addr here if peer doesn't issue prov_disc frame.
if( _rtw_memcmp(pwdinfo->rx_prov_disc_info.peerDevAddr, empty_addr, ETH_ALEN) );
if( _rtw_memcmp(pwdinfo->rx_prov_disc_info.peerDevAddr, empty_addr, ETH_ALEN) )
_rtw_memcpy(pwdinfo->rx_prov_disc_info.peerDevAddr, GetAddr2Ptr(pframe), ETH_ALEN);
result = process_p2p_group_negotation_req( pwdinfo, frame_body, len );

View File

@ -10033,7 +10033,6 @@ static int rtw_mp_read_reg(struct net_device *dev,
}
if ( data[i] != '\0' )
tmp[j] = data[i];
j++;
}
pch = tmp;