Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 267383
b: refs/heads/master
c: d1661df
h: refs/heads/master
i:
  267381: 8f9c417
  267379: 5599f7e
  267375: 9d55dbd
v: v3
  • Loading branch information
Ali Bahar authored and Greg Kroah-Hartman committed Aug 23, 2011
1 parent 6755e6c commit 31b2eb0
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 5 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: 1dac4186bcc663cb8c2bcc59481aea8fe9124a6c
refs/heads/master: d1661dfdb99138eca2d3fbcf9c651ffcaba6f28a
5 changes: 5 additions & 0 deletions trunk/drivers/staging/rtl8712/drv_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,11 @@ struct dvobj_priv {
struct usb_device *pusbdev;
};

/**
* struct _adapter - the main adapter structure for this device.
*
* bup: True indicates that the interface is Up.
*/
struct _adapter {
struct dvobj_priv dvobjpriv;
struct mlme_priv mlmepriv;
Expand Down
25 changes: 21 additions & 4 deletions trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -975,6 +975,13 @@ static int r871x_wx_set_priv(struct net_device *dev,
* s2. set_802_11_authentication_mode()
* s3. set_802_11_encryption_mode()
* s4. set_802_11_bssid()
*
* This function intends to handle the Set AP command, which specifies the
* MAC# of a preferred Access Point.
* Currently, the request comes via Wireless Extensions' SIOCSIWAP ioctl.
*
* For this operation to succeed, there is no need for the interface to be Up.
*
*/
static int r8711_wx_set_wap(struct net_device *dev,
struct iw_request_info *info,
Expand All @@ -992,8 +999,6 @@ static int r8711_wx_set_wap(struct net_device *dev,
struct wlan_network *pnetwork = NULL;
enum NDIS_802_11_AUTHENTICATION_MODE authmode;

if (padapter->bup == false)
return -1;
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true)
return -1;
if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true)
Expand Down Expand Up @@ -1074,6 +1079,14 @@ static int r871x_wx_set_mlme(struct net_device *dev,
return ret;
}

/**
*
* This function intends to handle the Set Scan command.
* Currently, the request comes via Wireless Extensions' SIOCSIWSCAN ioctl.
*
* For this operation to succeed, the interface is brought Up beforehand.
*
*/
static int r8711_wx_set_scan(struct net_device *dev,
struct iw_request_info *a,
union iwreq_data *wrqu, char *extra)
Expand Down Expand Up @@ -1169,6 +1182,12 @@ static int r8711_wx_get_scan(struct net_device *dev,
* s2. set_802_11_authenticaion_mode()
* s3. set_802_11_encryption_mode()
* s4. set_802_11_ssid()
*
* This function intends to handle the Set ESSID command.
* Currently, the request comes via the Wireless Extensions' SIOCSIWESSID ioctl.
*
* For this operation to succeed, there is no need for the interface to be Up.
*
*/
static int r8711_wx_set_essid(struct net_device *dev,
struct iw_request_info *a,
Expand All @@ -1184,8 +1203,6 @@ static int r8711_wx_set_essid(struct net_device *dev,
struct list_head *phead;
u32 len;

if (padapter->bup == false)
return -1;
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY))
return -1;
if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING))
Expand Down

0 comments on commit 31b2eb0

Please sign in to comment.