Skip to content

L
linux
Commit fdd9e860 authored by Johan Meiring's avatar Johan Meiring Committed by Greg Kroah-Hartman
Browse files
Options

staging: wlags49_h2: wl_priv: converts indentation to tabs 

This commit converts instances of space-based indentation to tabs.
Signed-off-by: default avatarJohan Meiring <johanmeiring@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7f622485
Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 97 deletions
drivers/staging/wlags49_h2/wl_priv.c
View file @ fdd9e860
...@@ -1152,9 +1152,9 @@ int wvlan_uil_put_info(struct uilreq *urq, struct wl_private *lp) ...@@ -1152,9 +1152,9 @@ int wvlan_uil_put_info(struct uilreq *urq, struct wl_private *lp)
} }
break; break;
default: default:
wl_act_int_off(lp); wl_act_int_off(lp);
urq->result = hcf_put_info(&(lp->hcfCtx), (LTVP) pLtv); urq->result = hcf_put_info(&(lp->hcfCtx), (LTVP) pLtv);
wl_act_int_on(lp); wl_act_int_on(lp);
break; break;
} }
...@@ -1315,9 +1315,9 @@ int wvlan_uil_get_info(struct uilreq *urq, struct wl_private *lp) ...@@ -1315,9 +1315,9 @@ int wvlan_uil_get_info(struct uilreq *urq, struct wl_private *lp)
pLtv = &(lp->ltvRecord); pLtv = &(lp->ltvRecord);
} }
wl_act_int_off(lp); wl_act_int_off(lp);
urq->result = hcf_get_info(&(lp->hcfCtx), (LTVP) pLtv); urq->result = hcf_get_info(&(lp->hcfCtx), (LTVP) pLtv);
wl_act_int_on(lp); wl_act_int_on(lp);
// Copy the LTV into the user's buffer. // Copy the LTV into the user's buffer.
//copy_to_user(urq->data, pLtv, urq->len); //copy_to_user(urq->data, pLtv, urq->len);
...@@ -1680,8 +1680,8 @@ int wvlan_set_netname(struct net_device *dev, ...@@ -1680,8 +1680,8 @@ int wvlan_set_netname(struct net_device *dev,
union iwreq_data *wrqu, union iwreq_data *wrqu,
char *extra) char *extra)
{ {
struct wl_private *lp = wl_priv(dev); struct wl_private *lp = wl_priv(dev);
unsigned long flags; unsigned long flags;
int ret = 0; int ret = 0;
/*------------------------------------------------------------------------*/ /*------------------------------------------------------------------------*/
...@@ -1689,14 +1689,14 @@ int wvlan_set_netname(struct net_device *dev, ...@@ -1689,14 +1689,14 @@ int wvlan_set_netname(struct net_device *dev,
DBG_FUNC("wvlan_set_netname"); DBG_FUNC("wvlan_set_netname");
DBG_ENTER(DbgInfo); DBG_ENTER(DbgInfo);
wl_lock(lp, &flags); wl_lock(lp, &flags);
memset(lp->NetworkName, 0, sizeof(lp->NetworkName)); memset(lp->NetworkName, 0, sizeof(lp->NetworkName));
memcpy(lp->NetworkName, extra, wrqu->data.length); memcpy(lp->NetworkName, extra, wrqu->data.length);
/* Commit the adapter parameters */ /* Commit the adapter parameters */
wl_apply(lp); wl_apply(lp);
wl_unlock(lp, &flags); wl_unlock(lp, &flags);
DBG_LEAVE(DbgInfo); DBG_LEAVE(DbgInfo);
return ret; return ret;
...@@ -1730,40 +1730,40 @@ int wvlan_get_netname(struct net_device *dev, ...@@ -1730,40 +1730,40 @@ int wvlan_get_netname(struct net_device *dev,
union iwreq_data *wrqu, union iwreq_data *wrqu,
char *extra) char *extra)
{ {
struct wl_private *lp = wl_priv(dev); struct wl_private *lp = wl_priv(dev);
unsigned long flags; unsigned long flags;
int ret = 0; int ret = 0;
int status = -1; int status = -1;
wvName_t *pName; wvName_t *pName;
/*------------------------------------------------------------------------*/ /*------------------------------------------------------------------------*/
DBG_FUNC("wvlan_get_netname"); DBG_FUNC("wvlan_get_netname");
DBG_ENTER(DbgInfo); DBG_ENTER(DbgInfo);
wl_lock(lp, &flags); wl_lock(lp, &flags);
/* Get the current network name */ /* Get the current network name */
lp->ltvRecord.len = 1 + (sizeof(*pName) / sizeof(hcf_16)); lp->ltvRecord.len = 1 + (sizeof(*pName) / sizeof(hcf_16));
lp->ltvRecord.typ = CFG_CUR_SSID; lp->ltvRecord.typ = CFG_CUR_SSID;
status = hcf_get_info(&(lp->hcfCtx), (LTVP)&(lp->ltvRecord)); status = hcf_get_info(&(lp->hcfCtx), (LTVP)&(lp->ltvRecord));
if (status == HCF_SUCCESS) { if (status == HCF_SUCCESS) {
pName = (wvName_t *)&(lp->ltvRecord.u.u32); pName = (wvName_t *)&(lp->ltvRecord.u.u32);
memset(extra, '\0', HCF_MAX_NAME_LEN); memset(extra, '\0', HCF_MAX_NAME_LEN);
wrqu->data.length = pName->length; wrqu->data.length = pName->length;
memcpy(extra, pName->name, pName->length); memcpy(extra, pName->name, pName->length);
} else { } else {
ret = -EFAULT; ret = -EFAULT;
} }
wl_unlock(lp, &flags); wl_unlock(lp, &flags);
DBG_LEAVE(DbgInfo); DBG_LEAVE(DbgInfo);
return ret; return ret;
} // wvlan_get_netname } // wvlan_get_netname
/*============================================================================*/ /*============================================================================*/
...@@ -1794,27 +1794,27 @@ int wvlan_set_station_nickname(struct net_device *dev, ...@@ -1794,27 +1794,27 @@ int wvlan_set_station_nickname(struct net_device *dev,
union iwreq_data *wrqu, union iwreq_data *wrqu,
char *extra) char *extra)
{ {
struct wl_private *lp = wl_priv(dev); struct wl_private *lp = wl_priv(dev);
unsigned long flags; unsigned long flags;
int ret = 0; int ret = 0;
/*------------------------------------------------------------------------*/ /*------------------------------------------------------------------------*/
DBG_FUNC("wvlan_set_station_nickname"); DBG_FUNC("wvlan_set_station_nickname");
DBG_ENTER(DbgInfo); DBG_ENTER(DbgInfo);
wl_lock(lp, &flags); wl_lock(lp, &flags);
memset(lp->StationName, 0, sizeof(lp->StationName)); memset(lp->StationName, 0, sizeof(lp->StationName));
memcpy(lp->StationName, extra, wrqu->data.length); memcpy(lp->StationName, extra, wrqu->data.length);
/* Commit the adapter parameters */ /* Commit the adapter parameters */
wl_apply(lp); wl_apply(lp);
wl_unlock(lp, &flags); wl_unlock(lp, &flags);
DBG_LEAVE(DbgInfo); DBG_LEAVE(DbgInfo);
return ret; return ret;
} // wvlan_set_station_nickname } // wvlan_set_station_nickname
/*============================================================================*/ /*============================================================================*/
...@@ -1845,39 +1845,39 @@ int wvlan_get_station_nickname(struct net_device *dev, ...@@ -1845,39 +1845,39 @@ int wvlan_get_station_nickname(struct net_device *dev,
union iwreq_data *wrqu, union iwreq_data *wrqu,
char *extra) char *extra)
{ {
struct wl_private *lp = wl_priv(dev); struct wl_private *lp = wl_priv(dev);
unsigned long flags; unsigned long flags;
int ret = 0; int ret = 0;
int status = -1; int status = -1;
wvName_t *pName; wvName_t *pName;
/*------------------------------------------------------------------------*/ /*------------------------------------------------------------------------*/
DBG_FUNC("wvlan_get_station_nickname"); DBG_FUNC("wvlan_get_station_nickname");
DBG_ENTER(DbgInfo); DBG_ENTER(DbgInfo);
wl_lock(lp, &flags); wl_lock(lp, &flags);
/* Get the current station name */ /* Get the current station name */
lp->ltvRecord.len = 1 + (sizeof(*pName) / sizeof(hcf_16)); lp->ltvRecord.len = 1 + (sizeof(*pName) / sizeof(hcf_16));
lp->ltvRecord.typ = CFG_CNF_OWN_NAME; lp->ltvRecord.typ = CFG_CNF_OWN_NAME;
status = hcf_get_info(&(lp->hcfCtx), (LTVP)&(lp->ltvRecord)); status = hcf_get_info(&(lp->hcfCtx), (LTVP)&(lp->ltvRecord));
if (status == HCF_SUCCESS) { if (status == HCF_SUCCESS) {
pName = (wvName_t *)&(lp->ltvRecord.u.u32); pName = (wvName_t *)&(lp->ltvRecord.u.u32);
memset(extra, '\0', HCF_MAX_NAME_LEN); memset(extra, '\0', HCF_MAX_NAME_LEN);
wrqu->data.length = pName->length; wrqu->data.length = pName->length;
memcpy(extra, pName->name, pName->length); memcpy(extra, pName->name, pName->length);
} else { } else {
ret = -EFAULT; ret = -EFAULT;
} }
wl_unlock(lp, &flags); wl_unlock(lp, &flags);
//out: //out:
DBG_LEAVE(DbgInfo); DBG_LEAVE(DbgInfo);
return ret; return ret;
} // wvlan_get_station_nickname } // wvlan_get_station_nickname
/*============================================================================*/ /*============================================================================*/
...@@ -1909,37 +1909,37 @@ int wvlan_set_porttype(struct net_device *dev, ...@@ -1909,37 +1909,37 @@ int wvlan_set_porttype(struct net_device *dev,
union iwreq_data *wrqu, union iwreq_data *wrqu,
char *extra) char *extra)
{ {
struct wl_private *lp = wl_priv(dev); struct wl_private *lp = wl_priv(dev);
unsigned long flags; unsigned long flags;
int ret = 0; int ret = 0;
hcf_16 portType; hcf_16 portType;
/*------------------------------------------------------------------------*/ /*------------------------------------------------------------------------*/
DBG_FUNC("wvlan_set_porttype"); DBG_FUNC("wvlan_set_porttype");
DBG_ENTER(DbgInfo); DBG_ENTER(DbgInfo);
wl_lock(lp, &flags); wl_lock(lp, &flags);
/* Validate the new value */ /* Validate the new value */
portType = *((__u32 *)extra); portType = *((__u32 *)extra);
if (!((portType == 1) || (portType == 3))) { if (!((portType == 1) || (portType == 3))) {
ret = -EINVAL; ret = -EINVAL;
goto out_unlock; goto out_unlock;
} }
lp->PortType = portType; lp->PortType = portType;
/* Commit the adapter parameters */ /* Commit the adapter parameters */
wl_apply(lp); wl_apply(lp);
out_unlock: out_unlock:
wl_unlock(lp, &flags); wl_unlock(lp, &flags);
//out: //out:
DBG_LEAVE(DbgInfo); DBG_LEAVE(DbgInfo);
return ret; return ret;
} }
/*============================================================================*/ /*============================================================================*/
...@@ -1969,39 +1969,39 @@ int wvlan_get_porttype(struct net_device *dev, ...@@ -1969,39 +1969,39 @@ int wvlan_get_porttype(struct net_device *dev,
union iwreq_data *wrqu, union iwreq_data *wrqu,
char *extra) char *extra)
{ {
struct wl_private *lp = wl_priv(dev); struct wl_private *lp = wl_priv(dev);
unsigned long flags; unsigned long flags;
int ret = 0; int ret = 0;
int status = -1; int status = -1;
hcf_16 *pPortType; hcf_16 *pPortType;
__u32 *pData = (__u32 *)extra; __u32 *pData = (__u32 *)extra;
/*------------------------------------------------------------------------*/ /*------------------------------------------------------------------------*/
DBG_FUNC("wvlan_get_porttype"); DBG_FUNC("wvlan_get_porttype");
DBG_ENTER(DbgInfo); DBG_ENTER(DbgInfo);
wl_lock(lp, &flags); wl_lock(lp, &flags);
/* Get the current port type */ /* Get the current port type */
lp->ltvRecord.len = 1 + (sizeof(*pPortType) / sizeof(hcf_16)); lp->ltvRecord.len = 1 + (sizeof(*pPortType) / sizeof(hcf_16));
lp->ltvRecord.typ = CFG_CNF_PORT_TYPE; lp->ltvRecord.typ = CFG_CNF_PORT_TYPE;
status = hcf_get_info(&(lp->hcfCtx), (LTVP)&(lp->ltvRecord)); status = hcf_get_info(&(lp->hcfCtx), (LTVP)&(lp->ltvRecord));
if (status == HCF_SUCCESS) { if (status == HCF_SUCCESS) {
pPortType = (hcf_16 *)&(lp->ltvRecord.u.u32); pPortType = (hcf_16 *)&(lp->ltvRecord.u.u32);
*pData = CNV_LITTLE_TO_INT(*pPortType); *pData = CNV_LITTLE_TO_INT(*pPortType);
} else { } else {
ret = -EFAULT; ret = -EFAULT;
} }
wl_unlock(lp, &flags); wl_unlock(lp, &flags);
//out: //out:
DBG_LEAVE(DbgInfo); DBG_LEAVE(DbgInfo);
return ret; return ret;
} // wvlan_get_porttype } // wvlan_get_porttype
/*============================================================================*/ /*============================================================================*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7