diff --git a/[refs] b/[refs] index bffe4015fad8..9f91c33a6a48 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abf1794e698d9bbdade846ef6ffd23b247cfb59f +refs/heads/master: 468d0c507b9c11a2e3ae95ff149eb551d05be8b9 diff --git a/trunk/drivers/staging/rt2860/sta_ioctl.c b/trunk/drivers/staging/rt2860/sta_ioctl.c index e5e294284108..b6ba561bfb5f 100644 --- a/trunk/drivers/staging/rt2860/sta_ioctl.c +++ b/trunk/drivers/staging/rt2860/sta_ioctl.c @@ -2978,6 +2978,7 @@ INT rt28xx_sta_ioctl( case SIOCSIWRETRY: //set retry limits and lifetime case RT_PRIV_IOCTL: case RT_PRIV_IOCTL_EXT: + case RTPRIV_IOCTL_SET: Status = -EOPNOTSUPP; break; case SIOCGIWPRIV: @@ -2990,11 +2991,6 @@ INT rt28xx_sta_ioctl( Status = -EFAULT; } break; - case RTPRIV_IOCTL_SET: - if(access_ok(VERIFY_READ, wrq->u.data.pointer, wrq->u.data.length) != TRUE) - break; - rt_ioctl_setparam(net_dev, NULL, NULL, wrq->u.data.pointer); - break; case RTPRIV_IOCTL_GSITESURVEY: RTMPIoctlGetSiteSurvey(pAd, wrq); break;