Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 196936
b: refs/heads/master
c: 8f18604
h: refs/heads/master
v: v3
  • Loading branch information
Julia Lawall authored and Greg Kroah-Hartman committed May 11, 2010
1 parent 02cf89d commit 597bc10
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 347fd7dbdb6ca771f59996ae3c75a2dfde66c3d7
refs/heads/master: 8f18604e6f0975fa852f43f90d5556efd67efadc
1 change: 0 additions & 1 deletion trunk/drivers/staging/rt2860/sta/assoc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1596,7 +1596,6 @@ BOOLEAN StaAddMacTableEntry(struct rt_rtmp_adapter *pAd,
union iwreq_data wrqu;
wext_notify_event_assoc(pAd);

memset(wrqu.ap_addr.sa_data, 0, MAC_ADDR_LEN);
memcpy(wrqu.ap_addr.sa_data, pAd->MlmeAux.Bssid, MAC_ADDR_LEN);
wireless_send_event(pAd->net_dev, SIOCGIWAP, &wrqu, NULL);

Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/staging/rt2860/sta_ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,6 @@ int rt_ioctl_siwap(struct net_device *dev,
/* Prevent to connect AP again in STAMlmePeriodicExec */
pAdapter->MlmeAux.AutoReconnectSsidLen = 32;

memset(Bssid, 0, MAC_ADDR_LEN);
memcpy(Bssid, ap_addr->sa_data, MAC_ADDR_LEN);
MlmeEnqueue(pAdapter,
MLME_CNTL_STATE_MACHINE,
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/staging/rtl8192su/r819xU_cmdpkt.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ bool SendTxCommandPacket(struct net_device *dev, void *pData, u32 DataLen)
tcb_desc->bLastIniPkt = 0;
skb_reserve(skb, USB_HWDESC_HEADER_LEN);
ptr_buf = skb_put(skb, DataLen);
memset(ptr_buf, 0, DataLen);
memcpy(ptr_buf, pData, DataLen);
tcb_desc->txbuf_size = (u16)DataLen;

Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/staging/rtl8192u/r819xU_cmdpkt.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ SendTxCommandPacket(
tcb_desc->bLastIniPkt = 0;
skb_reserve(skb, USB_HWDESC_HEADER_LEN);
ptr_buf = skb_put(skb, DataLen);
memset(ptr_buf,0,DataLen);
memcpy(ptr_buf,pData,DataLen);
tcb_desc->txbuf_size= (u16)DataLen;

Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/staging/vt6655/iwctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -699,7 +699,6 @@ if (pMgmt->eScanState == WMAC_IS_SCANNING) {
if (wrq->sa_family != ARPHRD_ETHER)
rc = -EINVAL;
else {
memset(pMgmt->abyDesireBSSID, 0xFF, 6);
memcpy(pMgmt->abyDesireBSSID, wrq->sa_data, 6);
//2008-0409-05, <Add> by Einsn Liu
if((pDevice->bLinkPass == TRUE) &&
Expand Down Expand Up @@ -889,7 +888,6 @@ if (pMgmt->eScanState == WMAC_IS_SCANNING) {
BYTE abyTmpDesireSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
UINT ii , uSameBssidNum=0;

memset(abyTmpDesireSSID,0,sizeof(abyTmpDesireSSID));
memcpy(abyTmpDesireSSID,pMgmt->abyDesireSSID,sizeof(abyTmpDesireSSID));
pCurr = BSSpSearchBSSList(pDevice,
NULL,
Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/staging/vt6656/iwctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,6 @@ int iwctl_siwap(struct net_device *dev,
if (wrq->sa_family != ARPHRD_ETHER)
rc = -EINVAL;
else {
memset(pMgmt->abyDesireBSSID, 0xFF, 6);
memcpy(pMgmt->abyDesireBSSID, wrq->sa_data, 6);

//mike :add
Expand Down Expand Up @@ -936,7 +935,6 @@ int iwctl_siwessid(struct net_device *dev,
BYTE abyTmpDesireSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
UINT ii , uSameBssidNum=0;

memset(abyTmpDesireSSID,0,sizeof(abyTmpDesireSSID));
memcpy(abyTmpDesireSSID,pMgmt->abyDesireSSID,sizeof(abyTmpDesireSSID));
pCurr = BSSpSearchBSSList(pDevice,
NULL,
Expand Down

0 comments on commit 597bc10

Please sign in to comment.