diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-04 15:42:20 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-04 15:42:20 +1000 |
| commit | 9e1bd9a6f8c6ad8b461294a365c49b19212178d9 (patch) | |
| tree | cdfb94ac635ef7050c6baa6448aa266c20abeeb0 /drivers/staging/vt6656/iwctl.c | |
| parent | 53823196033690f2f07382a94c982af486b94abb (diff) | |
| parent | e595eea993e499763922b2526cf67555c64612bc (diff) | |
Merge remote branch 'staging-next/staging-next'
Conflicts:
drivers/staging/arlan/arlan-main.c
drivers/staging/comedi/drivers/cb_das16_cs.c
drivers/staging/cx25821/cx25821-alsa.c
drivers/staging/dt3155/dt3155_drv.c
drivers/staging/netwave/netwave_cs.c
Diffstat (limited to 'drivers/staging/vt6656/iwctl.c')
| -rw-r--r-- | drivers/staging/vt6656/iwctl.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/vt6656/iwctl.c b/drivers/staging/vt6656/iwctl.c index b7c6a22fe321..d7ed3b456339 100644 --- a/drivers/staging/vt6656/iwctl.c +++ b/drivers/staging/vt6656/iwctl.c @@ -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 @@ -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, |