* [PATCH 31/32] staging: wlags49_h2: wl_util: converts C99 // comment
From: Johan Meiring @ 2012-11-30 16:58 UTC (permalink / raw)
To: pe1dnn, jkosina, standby24x7, viro, gregkh
Cc: devel, linux-kernel, Johan Meiring
In-Reply-To: <1354294737-5735-1-git-send-email-johanmeiring@gmail.com>
This commit converts a C99 // comment to /* */
Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
---
drivers/staging/wlags49_h2/wl_util.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/wlags49_h2/wl_util.h b/drivers/staging/wlags49_h2/wl_util.h
index 67ee069..9164c30a 100644
--- a/drivers/staging/wlags49_h2/wl_util.h
+++ b/drivers/staging/wlags49_h2/wl_util.h
@@ -93,4 +93,4 @@ void wl_process_updated_record(struct wl_private *lp);
void wl_process_assoc_status(struct wl_private *lp);
void wl_process_security_status(struct wl_private *lp);
-#endif // __WL_UTIL_H__
+#endif /* __WL_UTIL_H__ */
--
1.7.10.4
^ permalink raw reply related
* [PATCH 28/32] staging: wlags49_h2: wl_priv: converts indentation to tabs
From: Johan Meiring @ 2012-11-30 16:58 UTC (permalink / raw)
To: pe1dnn, jkosina, standby24x7, viro, gregkh
Cc: devel, linux-kernel, Johan Meiring
In-Reply-To: <1354294737-5735-1-git-send-email-johanmeiring@gmail.com>
This commit converts instances of space-based indentation to tabs.
Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
---
drivers/staging/wlags49_h2/wl_priv.c | 194 +++++++++++++++++-----------------
1 file changed, 97 insertions(+), 97 deletions(-)
diff --git a/drivers/staging/wlags49_h2/wl_priv.c b/drivers/staging/wlags49_h2/wl_priv.c
index b49ef87..193b3cd 100644
--- a/drivers/staging/wlags49_h2/wl_priv.c
+++ b/drivers/staging/wlags49_h2/wl_priv.c
@@ -1152,9 +1152,9 @@ int wvlan_uil_put_info(struct uilreq *urq, struct wl_private *lp)
}
break;
default:
- wl_act_int_off(lp);
+ wl_act_int_off(lp);
urq->result = hcf_put_info(&(lp->hcfCtx), (LTVP) pLtv);
- wl_act_int_on(lp);
+ wl_act_int_on(lp);
break;
}
@@ -1315,9 +1315,9 @@ int wvlan_uil_get_info(struct uilreq *urq, struct wl_private *lp)
pLtv = &(lp->ltvRecord);
}
- wl_act_int_off(lp);
+ wl_act_int_off(lp);
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_to_user(urq->data, pLtv, urq->len);
@@ -1680,8 +1680,8 @@ int wvlan_set_netname(struct net_device *dev,
union iwreq_data *wrqu,
char *extra)
{
- struct wl_private *lp = wl_priv(dev);
- unsigned long flags;
+ struct wl_private *lp = wl_priv(dev);
+ unsigned long flags;
int ret = 0;
/*------------------------------------------------------------------------*/
@@ -1689,14 +1689,14 @@ int wvlan_set_netname(struct net_device *dev,
DBG_FUNC("wvlan_set_netname");
DBG_ENTER(DbgInfo);
- wl_lock(lp, &flags);
+ wl_lock(lp, &flags);
- memset(lp->NetworkName, 0, sizeof(lp->NetworkName));
- memcpy(lp->NetworkName, extra, wrqu->data.length);
+ memset(lp->NetworkName, 0, sizeof(lp->NetworkName));
+ memcpy(lp->NetworkName, extra, wrqu->data.length);
/* Commit the adapter parameters */
wl_apply(lp);
- wl_unlock(lp, &flags);
+ wl_unlock(lp, &flags);
DBG_LEAVE(DbgInfo);
return ret;
@@ -1730,40 +1730,40 @@ int wvlan_get_netname(struct net_device *dev,
union iwreq_data *wrqu,
char *extra)
{
- struct wl_private *lp = wl_priv(dev);
- unsigned long flags;
- int ret = 0;
- int status = -1;
- wvName_t *pName;
+ struct wl_private *lp = wl_priv(dev);
+ unsigned long flags;
+ int ret = 0;
+ int status = -1;
+ wvName_t *pName;
/*------------------------------------------------------------------------*/
- DBG_FUNC("wvlan_get_netname");
- DBG_ENTER(DbgInfo);
+ DBG_FUNC("wvlan_get_netname");
+ DBG_ENTER(DbgInfo);
- wl_lock(lp, &flags);
+ wl_lock(lp, &flags);
- /* Get the current network name */
- lp->ltvRecord.len = 1 + (sizeof(*pName) / sizeof(hcf_16));
- lp->ltvRecord.typ = CFG_CUR_SSID;
+ /* Get the current network name */
+ lp->ltvRecord.len = 1 + (sizeof(*pName) / sizeof(hcf_16));
+ 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) {
- pName = (wvName_t *)&(lp->ltvRecord.u.u32);
+ if (status == HCF_SUCCESS) {
+ pName = (wvName_t *)&(lp->ltvRecord.u.u32);
memset(extra, '\0', HCF_MAX_NAME_LEN);
wrqu->data.length = pName->length;
- memcpy(extra, pName->name, pName->length);
- } else {
- ret = -EFAULT;
+ memcpy(extra, pName->name, pName->length);
+ } else {
+ ret = -EFAULT;
}
- wl_unlock(lp, &flags);
+ wl_unlock(lp, &flags);
- DBG_LEAVE(DbgInfo);
- return ret;
+ DBG_LEAVE(DbgInfo);
+ return ret;
} // wvlan_get_netname
/*============================================================================*/
@@ -1794,27 +1794,27 @@ int wvlan_set_station_nickname(struct net_device *dev,
union iwreq_data *wrqu,
char *extra)
{
- struct wl_private *lp = wl_priv(dev);
- unsigned long flags;
- int ret = 0;
+ struct wl_private *lp = wl_priv(dev);
+ unsigned long flags;
+ int ret = 0;
/*------------------------------------------------------------------------*/
- DBG_FUNC("wvlan_set_station_nickname");
- DBG_ENTER(DbgInfo);
+ DBG_FUNC("wvlan_set_station_nickname");
+ 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 */
- wl_apply(lp);
- wl_unlock(lp, &flags);
+ /* Commit the adapter parameters */
+ wl_apply(lp);
+ wl_unlock(lp, &flags);
- DBG_LEAVE(DbgInfo);
- return ret;
+ DBG_LEAVE(DbgInfo);
+ return ret;
} // wvlan_set_station_nickname
/*============================================================================*/
@@ -1845,39 +1845,39 @@ int wvlan_get_station_nickname(struct net_device *dev,
union iwreq_data *wrqu,
char *extra)
{
- struct wl_private *lp = wl_priv(dev);
- unsigned long flags;
+ struct wl_private *lp = wl_priv(dev);
+ unsigned long flags;
int ret = 0;
int status = -1;
wvName_t *pName;
/*------------------------------------------------------------------------*/
- DBG_FUNC("wvlan_get_station_nickname");
- DBG_ENTER(DbgInfo);
+ DBG_FUNC("wvlan_get_station_nickname");
+ DBG_ENTER(DbgInfo);
- wl_lock(lp, &flags);
+ wl_lock(lp, &flags);
- /* Get the current station name */
- lp->ltvRecord.len = 1 + (sizeof(*pName) / sizeof(hcf_16));
- lp->ltvRecord.typ = CFG_CNF_OWN_NAME;
+ /* Get the current station name */
+ lp->ltvRecord.len = 1 + (sizeof(*pName) / sizeof(hcf_16));
+ 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) {
- pName = (wvName_t *)&(lp->ltvRecord.u.u32);
+ if (status == HCF_SUCCESS) {
+ pName = (wvName_t *)&(lp->ltvRecord.u.u32);
memset(extra, '\0', HCF_MAX_NAME_LEN);
wrqu->data.length = pName->length;
memcpy(extra, pName->name, pName->length);
- } else {
- ret = -EFAULT;
- }
+ } else {
+ ret = -EFAULT;
+ }
- wl_unlock(lp, &flags);
+ wl_unlock(lp, &flags);
//out:
- DBG_LEAVE(DbgInfo);
+ DBG_LEAVE(DbgInfo);
return ret;
} // wvlan_get_station_nickname
/*============================================================================*/
@@ -1909,37 +1909,37 @@ int wvlan_set_porttype(struct net_device *dev,
union iwreq_data *wrqu,
char *extra)
{
- struct wl_private *lp = wl_priv(dev);
- unsigned long flags;
- int ret = 0;
+ struct wl_private *lp = wl_priv(dev);
+ unsigned long flags;
+ int ret = 0;
hcf_16 portType;
/*------------------------------------------------------------------------*/
- DBG_FUNC("wvlan_set_porttype");
- DBG_ENTER(DbgInfo);
+ DBG_FUNC("wvlan_set_porttype");
+ DBG_ENTER(DbgInfo);
- wl_lock(lp, &flags);
+ wl_lock(lp, &flags);
- /* Validate the new value */
- portType = *((__u32 *)extra);
+ /* Validate the new value */
+ portType = *((__u32 *)extra);
- if (!((portType == 1) || (portType == 3))) {
- ret = -EINVAL;
+ if (!((portType == 1) || (portType == 3))) {
+ ret = -EINVAL;
goto out_unlock;
- }
+ }
- lp->PortType = portType;
+ lp->PortType = portType;
- /* Commit the adapter parameters */
- wl_apply(lp);
+ /* Commit the adapter parameters */
+ wl_apply(lp);
out_unlock:
- wl_unlock(lp, &flags);
+ wl_unlock(lp, &flags);
//out:
- DBG_LEAVE(DbgInfo);
- return ret;
+ DBG_LEAVE(DbgInfo);
+ return ret;
}
/*============================================================================*/
@@ -1969,39 +1969,39 @@ int wvlan_get_porttype(struct net_device *dev,
union iwreq_data *wrqu,
char *extra)
{
- struct wl_private *lp = wl_priv(dev);
- unsigned long flags;
- int ret = 0;
- int status = -1;
- hcf_16 *pPortType;
- __u32 *pData = (__u32 *)extra;
+ struct wl_private *lp = wl_priv(dev);
+ unsigned long flags;
+ int ret = 0;
+ int status = -1;
+ hcf_16 *pPortType;
+ __u32 *pData = (__u32 *)extra;
/*------------------------------------------------------------------------*/
- DBG_FUNC("wvlan_get_porttype");
- DBG_ENTER(DbgInfo);
+ DBG_FUNC("wvlan_get_porttype");
+ DBG_ENTER(DbgInfo);
- wl_lock(lp, &flags);
+ wl_lock(lp, &flags);
- /* Get the current port type */
- lp->ltvRecord.len = 1 + (sizeof(*pPortType) / sizeof(hcf_16));
- lp->ltvRecord.typ = CFG_CNF_PORT_TYPE;
+ /* Get the current port type */
+ lp->ltvRecord.len = 1 + (sizeof(*pPortType) / sizeof(hcf_16));
+ 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) {
- pPortType = (hcf_16 *)&(lp->ltvRecord.u.u32);
+ if (status == HCF_SUCCESS) {
+ pPortType = (hcf_16 *)&(lp->ltvRecord.u.u32);
- *pData = CNV_LITTLE_TO_INT(*pPortType);
- } else {
- ret = -EFAULT;
+ *pData = CNV_LITTLE_TO_INT(*pPortType);
+ } else {
+ ret = -EFAULT;
}
- wl_unlock(lp, &flags);
+ wl_unlock(lp, &flags);
//out:
- DBG_LEAVE(DbgInfo);
- return ret;
+ DBG_LEAVE(DbgInfo);
+ return ret;
} // wvlan_get_porttype
/*============================================================================*/
--
1.7.10.4
^ permalink raw reply related
* [PATCH 26/32] staging: wlags49_h2: wl_priv: fixes case statement styling issues
From: Johan Meiring @ 2012-11-30 16:58 UTC (permalink / raw)
To: pe1dnn, jkosina, standby24x7, viro, gregkh
Cc: devel, linux-kernel, Johan Meiring
In-Reply-To: <1354294737-5735-1-git-send-email-johanmeiring@gmail.com>
This commit fixes issues related to the styling of case statements.
Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
---
drivers/staging/wlags49_h2/wl_priv.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/wlags49_h2/wl_priv.c b/drivers/staging/wlags49_h2/wl_priv.c
index e2615a1..093e1ea 100644
--- a/drivers/staging/wlags49_h2/wl_priv.c
+++ b/drivers/staging/wlags49_h2/wl_priv.c
@@ -136,27 +136,27 @@ int wvlan_uil(struct uilreq *urq, struct wl_private *lp)
DBG_ENTER(DbgInfo);
switch (urq->command) {
- case UIL_FUN_CONNECT:
+ case UIL_FUN_CONNECT:
DBG_TRACE(DbgInfo, "IOCTL: WVLAN2_IOCTL_UIL -- WVLAN2_UIL_CONNECT\n");
ioctl_ret = wvlan_uil_connect(urq, lp);
break;
- case UIL_FUN_DISCONNECT:
+ case UIL_FUN_DISCONNECT:
DBG_TRACE(DbgInfo, "IOCTL: WVLAN2_IOCTL_UIL -- WVLAN2_UIL_DISCONNECT\n");
ioctl_ret = wvlan_uil_disconnect(urq, lp);
break;
- case UIL_FUN_ACTION:
+ case UIL_FUN_ACTION:
DBG_TRACE(DbgInfo, "IOCTL: WVLAN2_IOCTL_UIL -- WVLAN2_UIL_ACTION\n");
ioctl_ret = wvlan_uil_action(urq, lp);
break;
- case UIL_FUN_SEND_DIAG_MSG:
+ case UIL_FUN_SEND_DIAG_MSG:
DBG_TRACE(DbgInfo, "IOCTL: WVLAN2_IOCTL_UIL -- WVLAN2_UIL_SEND_DIAG_MSG\n");
ioctl_ret = wvlan_uil_send_diag_msg(urq, lp);
break;
- case UIL_FUN_GET_INFO:
+ case UIL_FUN_GET_INFO:
DBG_TRACE(DbgInfo, "IOCTL: WVLAN2_IOCTL_UIL -- WVLAN2_UIL_GET_INFO\n");
ioctl_ret = wvlan_uil_get_info(urq, lp);
break;
- case UIL_FUN_PUT_INFO:
+ case UIL_FUN_PUT_INFO:
DBG_TRACE(DbgInfo, "IOCTL: WVLAN2_IOCTL_UIL -- WVLAN2_UIL_PUT_INFO\n");
ioctl_ret = wvlan_uil_put_info(urq, lp);
break;
@@ -2047,22 +2047,22 @@ int wvlan_rts(struct rtsreq *rrq, __u32 io_base)
DBG_PRINT("io_base: 0x%08x\n", io_base);
switch (rrq->typ) {
- case WL_IOCTL_RTS_READ:
+ case WL_IOCTL_RTS_READ:
DBG_TRACE(DbgInfo, "IOCTL: WVLAN2_IOCTL_RTS -- WL_IOCTL_RTS_READ\n");
rrq->data[0] = IN_PORT_WORD(io_base + rrq->reg);
DBG_TRACE(DbgInfo, " reg 0x%04x ==> 0x%04x\n", rrq->reg, CNV_LITTLE_TO_SHORT(rrq->data[0]));
break;
- case WL_IOCTL_RTS_WRITE:
+ case WL_IOCTL_RTS_WRITE:
DBG_TRACE(DbgInfo, "IOCTL: WVLAN2_IOCTL_RTS -- WL_IOCTL_RTS_WRITE\n");
OUT_PORT_WORD(io_base + rrq->reg, rrq->data[0]);
DBG_TRACE(DbgInfo, " reg 0x%04x <== 0x%04x\n", rrq->reg, CNV_LITTLE_TO_SHORT(rrq->data[0]));
break;
- case WL_IOCTL_RTS_BATCH_READ:
+ case WL_IOCTL_RTS_BATCH_READ:
DBG_TRACE(DbgInfo, "IOCTL: WVLAN2_IOCTL_RTS -- WL_IOCTL_RTS_BATCH_READ\n");
IN_PORT_STRING_16(io_base + rrq->reg, rrq->data, rrq->len);
DBG_TRACE(DbgInfo, " reg 0x%04x ==> %d bytes\n", rrq->reg, rrq->len * sizeof(__u16));
break;
- case WL_IOCTL_RTS_BATCH_WRITE:
+ case WL_IOCTL_RTS_BATCH_WRITE:
DBG_TRACE(DbgInfo, "IOCTL: WVLAN2_IOCTL_RTS -- WL_IOCTL_RTS_BATCH_WRITE\n");
OUT_PORT_STRING_16(io_base + rrq->reg, rrq->data, rrq->len);
DBG_TRACE(DbgInfo, " reg 0x%04x <== %d bytes\n", rrq->reg, rrq->len * sizeof(__u16));
--
1.7.10.4
^ permalink raw reply related
* [PATCH 22/32] staging: wlags49_h2: wl_profile.h: fixes C99 // comment
From: Johan Meiring @ 2012-11-30 16:58 UTC (permalink / raw)
To: pe1dnn, jkosina, standby24x7, viro, gregkh
Cc: devel, linux-kernel, Johan Meiring
In-Reply-To: <1354294737-5735-1-git-send-email-johanmeiring@gmail.com>
This commit converts a C99 // comment to /* */. The checkpatch.pl
tool reports that this file has no further styling issues.
Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
---
drivers/staging/wlags49_h2/wl_profile.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/wlags49_h2/wl_profile.h b/drivers/staging/wlags49_h2/wl_profile.h
index 12faba2..d615c83 100644
--- a/drivers/staging/wlags49_h2/wl_profile.h
+++ b/drivers/staging/wlags49_h2/wl_profile.h
@@ -84,4 +84,4 @@ int parse_mac_address(char *value, u_char *byte_array);
void ParseConfigLine(char *pszLine, char **ppszLVal, char **ppszRVal);
-#endif // __WL_PROFILE_H__
+#endif /* __WL_PROFILE_H__ */
--
1.7.10.4
^ permalink raw reply related
* [PATCH 21/32] staging: wlags49_h2: wl_profile.h: fixes spacing around parentheses
From: Johan Meiring @ 2012-11-30 16:58 UTC (permalink / raw)
To: pe1dnn, jkosina, standby24x7, viro, gregkh
Cc: devel, linux-kernel, Johan Meiring
In-Reply-To: <1354294737-5735-1-git-send-email-johanmeiring@gmail.com>
This commit cleans up the spacing around parentheses.
Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
---
drivers/staging/wlags49_h2/wl_profile.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wlags49_h2/wl_profile.h b/drivers/staging/wlags49_h2/wl_profile.h
index f81df51..12faba2 100644
--- a/drivers/staging/wlags49_h2/wl_profile.h
+++ b/drivers/staging/wlags49_h2/wl_profile.h
@@ -73,15 +73,15 @@
/*******************************************************************************
* function prototypes
******************************************************************************/
-void parse_config( struct net_device *dev );
+void parse_config(struct net_device *dev);
-int readline( int filedesc, char *buffer );
+int readline(int filedesc, char *buffer);
-void translate_option( char *buffer, struct wl_private *lp );
+void translate_option(char *buffer, struct wl_private *lp);
-int parse_mac_address( char *value, u_char *byte_array );
+int parse_mac_address(char *value, u_char *byte_array);
-void ParseConfigLine( char *pszLine, char **ppszLVal, char **ppszRVal );
+void ParseConfigLine(char *pszLine, char **ppszLVal, char **ppszRVal);
#endif // __WL_PROFILE_H__
--
1.7.10.4
^ permalink raw reply related
* [PATCH 20/32] staging: wlags49_h2: sta_h2: corrects C99 // comments
From: Johan Meiring @ 2012-11-30 16:58 UTC (permalink / raw)
To: pe1dnn, jkosina, standby24x7, viro, gregkh
Cc: devel, linux-kernel, Johan Meiring
In-Reply-To: <1354294737-5735-1-git-send-email-johanmeiring@gmail.com>
This commit converts C99 // comments to /* */
Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
---
drivers/staging/wlags49_h2/sta_h2.c | 70 +++++++++++++++++------------------
1 file changed, 35 insertions(+), 35 deletions(-)
diff --git a/drivers/staging/wlags49_h2/sta_h2.c b/drivers/staging/wlags49_h2/sta_h2.c
index f0991c4..19bed81 100644
--- a/drivers/staging/wlags49_h2/sta_h2.c
+++ b/drivers/staging/wlags49_h2/sta_h2.c
@@ -25,10 +25,10 @@
*/
-#include "hcfcfg.h" // to get hcf_16 etc defined as well as
- // possible settings which influence mdd.h or dhf.h
-#include "mdd.h" // to get COMP_ID_STA etc defined
-#include "dhf.h" // used to be fhfmem.h, to get memblock,plugrecord,
+#include "hcfcfg.h" /* to get hcf_16 etc defined as well as */
+ /* possible settings which influence mdd.h or dhf.h */
+#include "mdd.h" /* to get COMP_ID_STA etc defined */
+#include "dhf.h" /* used to be fhfmem.h, to get memblock,plugrecord, */
static const hcf_8 fw_image_1_data[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -4384,56 +4384,56 @@ static const CFG_IDENTITY_STRCT fw_image_infoidentity[] = {
sizeof(CFG_IDENTITY_STRCT) / sizeof(hcf_16) - 1,
CFG_FW_IDENTITY,
COMP_ID_FW_STA,
- 3, //Variant
- 2, //Major
- 36 //Minor
+ 3, /* Variant */
+ 2, /* Major */
+ 36 /* Minor */
},
- { 0000, 0000, 0000, 0000, 0000, 0000 } //endsentinel
+ { 0000, 0000, 0000, 0000, 0000, 0000 } /* endsentinel */
};
static const CFG_PROG_STRCT fw_image_code[] = {
{
8,
CFG_PROG,
- CFG_PROG_VOLATILE, // mode
- 0x0186, // sizeof(fw_image_1_data),
- 0x00000060, // Target address in NIC Memory
- 0x0000, // CRC: yes/no TYPE: primary/station/tertiary
+ CFG_PROG_VOLATILE, /* mode */
+ 0x0186, /* sizeof(fw_image_1_data), */
+ 0x00000060, /* Target address in NIC Memory */
+ 0x0000, /* CRC: yes/no TYPE: primary/station/tertiary */
(hcf_8 *)fw_image_1_data
},
{
8,
CFG_PROG,
- CFG_PROG_VOLATILE, // mode
- 0x2518, // sizeof(fw_image_2_data),
- 0x00000C16, // Target address in NIC Memory
- 0x0000, // CRC: yes/no TYPE: primary/station/tertiary
+ CFG_PROG_VOLATILE, /* mode */
+ 0x2518, /* sizeof(fw_image_2_data), */
+ 0x00000C16, /* Target address in NIC Memory */
+ 0x0000, /* CRC: yes/no TYPE: primary/station/tertiary */
(hcf_8 *)fw_image_2_data
},
{
8,
CFG_PROG,
- CFG_PROG_VOLATILE, // mode
- 0x3daa, // sizeof(fw_image_3_data),
- 0x001E312E, // Target address in NIC Memory
- 0x0000, // CRC: yes/no TYPE: primary/station/tertiary
+ CFG_PROG_VOLATILE, /* mode */
+ 0x3daa, /* sizeof(fw_image_3_data), */
+ 0x001E312E, /* Target address in NIC Memory */
+ 0x0000, /* CRC: yes/no TYPE: primary/station/tertiary */
(hcf_8 *)fw_image_3_data
},
{
8,
CFG_PROG,
- CFG_PROG_VOLATILE, // mode
- 0xaa66, // sizeof(fw_image_4_data),
- 0x001F4000, // Target address in NIC Memory
- 0x0000, // CRC: yes/no TYPE: primary/station/tertiary
+ CFG_PROG_VOLATILE, /* mode */
+ 0xaa66, /* sizeof(fw_image_4_data), */
+ 0x001F4000, /* Target address in NIC Memory */
+ 0x0000, /* CRC: yes/no TYPE: primary/station/tertiary */
(hcf_8 *)fw_image_4_data
},
{
5,
CFG_PROG,
- CFG_PROG_STOP, // mode
+ CFG_PROG_STOP, /* mode */
0000,
- 0x000F368E, // Start execution address
+ 0x000F368E, /* Start execution address */
},
{ 0000, 0000, 0000, 0000, 00000000, 0000, 00000000}
};
@@ -4444,7 +4444,7 @@ static const CFG_RANGE20_STRCT fw_image_infocompat[] = {
COMP_ROLE_SUPL,
COMP_ID_STA,
{
- { 2, 2, 5 } //variant, bottom, top
+ { 2, 2, 5 } /* variant, bottom, top */
}
},
{ 3 + ((20 * sizeof(CFG_RANGE_SPEC_STRCT)) / sizeof(hcf_16)),
@@ -4452,9 +4452,9 @@ static const CFG_RANGE20_STRCT fw_image_infocompat[] = {
COMP_ROLE_ACT,
COMP_ID_MFI,
{
- { 4, 6, 7 }, //variant, bottom, top
- { 5, 6, 7 }, //variant, bottom, top
- { 6, 6, 7 } //variant, bottom, top
+ { 4, 6, 7 }, /* variant, bottom, top */
+ { 5, 6, 7 }, /* variant, bottom, top */
+ { 6, 6, 7 } /* variant, bottom, top */
}
},
{ 3 + ((20 * sizeof(CFG_RANGE_SPEC_STRCT)) / sizeof(hcf_16)),
@@ -4462,18 +4462,18 @@ static const CFG_RANGE20_STRCT fw_image_infocompat[] = {
COMP_ROLE_ACT,
COMP_ID_CFI,
{
- { 2, 1, 2 } //variant, bottom, top
+ { 2, 1, 2 } /* variant, bottom, top */
}
},
- { 0000, 0000, 0000, 0000, { { 0000, 0000, 0000 } } } //endsentinel
+ { 0000, 0000, 0000, 0000, { { 0000, 0000, 0000 } } } /* endsentinel */
};
memimage fw_image = {
- "FUPU7D37dhfwci\001C", //signature, <format number>, C/Bin type
+ "FUPU7D37dhfwci\001C", /* signature, <format number>, C/Bin type */
(CFG_PROG_STRCT *) fw_image_code,
0x000F368E,
- 00000000, //(dummy) pdaplug
- 00000000, //(dummy) priplug
+ 00000000, /* (dummy) pdaplug */
+ 00000000, /* (dummy) priplug */
(CFG_RANGE20_STRCT *) fw_image_infocompat,
(CFG_IDENTITY_STRCT *) fw_image_infoidentity,
};
--
1.7.10.4
^ permalink raw reply related
* [PATCH 18/32] staging: wlags49_h2: sta_h2: fixes spaces around parentheses
From: Johan Meiring @ 2012-11-30 16:58 UTC (permalink / raw)
To: pe1dnn, jkosina, standby24x7, viro, gregkh
Cc: devel, linux-kernel, Johan Meiring
In-Reply-To: <1354294737-5735-1-git-send-email-johanmeiring@gmail.com>
This commit fixes an instance where the spacing around parentheses
was incorrect.
Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
---
drivers/staging/wlags49_h2/sta_h2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/wlags49_h2/sta_h2.c b/drivers/staging/wlags49_h2/sta_h2.c
index 7c50ccd..711c7e0 100644
--- a/drivers/staging/wlags49_h2/sta_h2.c
+++ b/drivers/staging/wlags49_h2/sta_h2.c
@@ -4381,7 +4381,7 @@ static const hcf_8 fw_image_4_data[] = {
static const CFG_IDENTITY_STRCT fw_image_infoidentity[] = {
{
- sizeof( CFG_IDENTITY_STRCT ) / sizeof(hcf_16) - 1,
+ sizeof(CFG_IDENTITY_STRCT) / sizeof(hcf_16) - 1,
CFG_FW_IDENTITY,
COMP_ID_FW_STA,
3, //Variant
--
1.7.10.4
^ permalink raw reply related
* Re: [PATCH 8/8] x86, cleanups: Simplify sync_core() in the case of no CPUID
From: Linus Torvalds @ 2012-11-30 17:01 UTC (permalink / raw)
To: H. Peter Anvin
Cc: Borislav Petkov, H. Peter Anvin, Ingo Molnar, Thomas Gleixner,
Linux Kernel Mailing List, Mario Gzuk
In-Reply-To: <50B7D28A.4000401@linux.intel.com>
On Thu, Nov 29, 2012 at 1:24 PM, H. Peter Anvin <hpa@linux.intel.com> wrote:
>
> Thinking about it some more, there is another reason to not do this,
> which is that we don't want this particular CPUID to be paravirtualized;
> we're after the synchronizing side effect, not the CPUID return value
> itself.
>
> So let's leave it as a primitive; it gets too confusing otherwise.
Hmm. The virtualization issue brings up another point: do we *really*
want to use cpuid for serialization at all?
Exactly because under _real_ virtualization (as opposed to para-virt),
it can cause unnecessary exits in a virtualized environment, no?
So I'm wondering if there is any better synchronizing instruction..
I guess sync_core() isn't used *that* much, so maybe we don't care,
but I thought I'd ask...
Linus
^ permalink raw reply
* [PATCH 16/32] staging: wlags49_h2: sta_h2: fixes spaces-before-tabs problems
From: Johan Meiring @ 2012-11-30 16:58 UTC (permalink / raw)
To: pe1dnn, jkosina, standby24x7, viro, gregkh
Cc: devel, linux-kernel, Johan Meiring
In-Reply-To: <1354294737-5735-1-git-send-email-johanmeiring@gmail.com>
This commit various cases where there were spaces before tabs, as
reported by the checkpatch.pl tool.
Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
---
drivers/staging/wlags49_h2/sta_h2.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/wlags49_h2/sta_h2.c b/drivers/staging/wlags49_h2/sta_h2.c
index 00dffe2..6fc61ba 100644
--- a/drivers/staging/wlags49_h2/sta_h2.c
+++ b/drivers/staging/wlags49_h2/sta_h2.c
@@ -25,10 +25,10 @@
*/
-#include "hcfcfg.h" // to get hcf_16 etc defined as well as
- // possible settings which influence mdd.h or dhf.h
-#include "mdd.h" //to get COMP_ID_STA etc defined
-#include "dhf.h" //used to be "fhfmem.h", to get memblock,plugrecord,
+#include "hcfcfg.h" // to get hcf_16 etc defined as well as
+ // possible settings which influence mdd.h or dhf.h
+#include "mdd.h" // to get COMP_ID_STA etc defined
+#include "dhf.h" // used to be "fhfmem.h", to get memblock,plugrecord,
static const hcf_8 fw_image_1_data[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -4433,7 +4433,7 @@ static const CFG_PROG_STRCT fw_image_code[] = {
CFG_PROG,
CFG_PROG_STOP, // mode
0000,
- 0x000F368E, // Start execution address
+ 0x000F368E, // Start execution address
},
{ 0000, 0000, 0000, 0000, 00000000, 0000, 00000000}
};
@@ -4444,7 +4444,7 @@ static const CFG_RANGE20_STRCT fw_image_infocompat[] = {
COMP_ROLE_SUPL,
COMP_ID_STA,
{
- { 2, 2, 5 } //variant, bottom, top
+ { 2, 2, 5 } //variant, bottom, top
}
},
{ 3 + ((20 * sizeof(CFG_RANGE_SPEC_STRCT)) / sizeof(hcf_16)),
@@ -4452,9 +4452,9 @@ static const CFG_RANGE20_STRCT fw_image_infocompat[] = {
COMP_ROLE_ACT,
COMP_ID_MFI,
{
- { 4, 6, 7 }, //variant, bottom, top
- { 5, 6, 7 }, //variant, bottom, top
- { 6, 6, 7 } //variant, bottom, top
+ { 4, 6, 7 }, //variant, bottom, top
+ { 5, 6, 7 }, //variant, bottom, top
+ { 6, 6, 7 } //variant, bottom, top
}
},
{ 3 + ((20 * sizeof(CFG_RANGE_SPEC_STRCT)) / sizeof(hcf_16)),
@@ -4462,7 +4462,7 @@ static const CFG_RANGE20_STRCT fw_image_infocompat[] = {
COMP_ROLE_ACT,
COMP_ID_CFI,
{
- { 2, 1, 2 } //variant, bottom, top
+ { 2, 1, 2 } //variant, bottom, top
}
},
{ 0000, 0000, 0000, 0000, { { 0000, 0000, 0000 } } } //endsentinel
--
1.7.10.4
^ permalink raw reply related
* [PATCH 15/32] staging: wlags49_h2: wl_netdev.h: sorts out spacing issues
From: Johan Meiring @ 2012-11-30 16:58 UTC (permalink / raw)
To: pe1dnn, jkosina, standby24x7, viro, gregkh
Cc: devel, linux-kernel, Johan Meiring
In-Reply-To: <1354294737-5735-1-git-send-email-johanmeiring@gmail.com>
This commit fixes issues regarding spacing around parentheses. The
checkpatch.pl tool reports that this file has no further styling
issues.
Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
---
drivers/staging/wlags49_h2/wl_netdev.h | 90 ++++++++++++++++----------------
1 file changed, 45 insertions(+), 45 deletions(-)
diff --git a/drivers/staging/wlags49_h2/wl_netdev.h b/drivers/staging/wlags49_h2/wl_netdev.h
index 78a7057..95bfbeb 100644
--- a/drivers/staging/wlags49_h2/wl_netdev.h
+++ b/drivers/staging/wlags49_h2/wl_netdev.h
@@ -68,85 +68,85 @@
/*******************************************************************************
* function prototypes
******************************************************************************/
-int wl_init( struct net_device *dev );
+int wl_init(struct net_device *dev);
-int wl_config( struct net_device *dev, struct ifmap *map );
+int wl_config(struct net_device *dev, struct ifmap *map);
-struct net_device *wl_device_alloc( void );
+struct net_device *wl_device_alloc(void);
-void wl_device_dealloc( struct net_device *dev );
+void wl_device_dealloc(struct net_device *dev);
-int wl_open( struct net_device *dev );
+int wl_open(struct net_device *dev);
-int wl_close( struct net_device *dev );
+int wl_close(struct net_device *dev);
-int wl_ioctl( struct net_device *dev, struct ifreq *rq, int cmd );
+int wl_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
-int wl_tx( struct sk_buff *skb, struct net_device *dev, int port );
+int wl_tx(struct sk_buff *skb, struct net_device *dev, int port);
-int wl_send( struct wl_private *lp );
+int wl_send(struct wl_private *lp);
-int wl_rx( struct net_device *dev );
+int wl_rx(struct net_device *dev);
-void wl_tx_timeout( struct net_device *dev );
+void wl_tx_timeout(struct net_device *dev);
-struct net_device_stats *wl_stats( struct net_device *dev );
+struct net_device_stats *wl_stats(struct net_device *dev);
#ifdef ENABLE_DMA
-int wl_send_dma( struct wl_private *lp, struct sk_buff *skb, int port );
-int wl_rx_dma( struct net_device *dev );
+int wl_send_dma(struct wl_private *lp, struct sk_buff *skb, int port);
+int wl_rx_dma(struct net_device *dev);
#endif
#ifdef NEW_MULTICAST
-void wl_multicast( struct net_device *dev );
+void wl_multicast(struct net_device *dev);
#else
-void wl_multicast( struct net_device *dev, int num_addrs, void *addrs );
+void wl_multicast(struct net_device *dev, int num_addrs, void *addrs);
#endif /* NEW_MULTICAST */
-int wl_tx_port0( struct sk_buff *skb, struct net_device *dev );
+int wl_tx_port0(struct sk_buff *skb, struct net_device *dev);
#ifdef USE_WDS
-int wl_tx_port1( struct sk_buff *skb, struct net_device *dev );
-int wl_tx_port2( struct sk_buff *skb, struct net_device *dev );
-int wl_tx_port3( struct sk_buff *skb, struct net_device *dev );
-int wl_tx_port4( struct sk_buff *skb, struct net_device *dev );
-int wl_tx_port5( struct sk_buff *skb, struct net_device *dev );
-int wl_tx_port6( struct sk_buff *skb, struct net_device *dev );
-
-void wl_wds_device_alloc( struct wl_private *lp );
-void wl_wds_device_dealloc( struct wl_private *lp );
-void wl_wds_netif_start_queue( struct wl_private *lp );
-void wl_wds_netif_stop_queue( struct wl_private *lp );
-void wl_wds_netif_wake_queue( struct wl_private *lp );
-void wl_wds_netif_carrier_on( struct wl_private *lp );
-void wl_wds_netif_carrier_off( struct wl_private *lp );
+int wl_tx_port1(struct sk_buff *skb, struct net_device *dev);
+int wl_tx_port2(struct sk_buff *skb, struct net_device *dev);
+int wl_tx_port3(struct sk_buff *skb, struct net_device *dev);
+int wl_tx_port4(struct sk_buff *skb, struct net_device *dev);
+int wl_tx_port5(struct sk_buff *skb, struct net_device *dev);
+int wl_tx_port6(struct sk_buff *skb, struct net_device *dev);
+
+void wl_wds_device_alloc(struct wl_private *lp);
+void wl_wds_device_dealloc(struct wl_private *lp);
+void wl_wds_netif_start_queue(struct wl_private *lp);
+void wl_wds_netif_stop_queue(struct wl_private *lp);
+void wl_wds_netif_wake_queue(struct wl_private *lp);
+void wl_wds_netif_carrier_on(struct wl_private *lp);
+void wl_wds_netif_carrier_off(struct wl_private *lp);
#endif /* USE_WDS */
#ifdef USE_WDS
-#define WL_WDS_DEVICE_ALLOC( ARG ) wl_wds_device_alloc( ARG )
-#define WL_WDS_DEVICE_DEALLOC( ARG ) wl_wds_device_dealloc( ARG )
-#define WL_WDS_NETIF_START_QUEUE( ARG ) wl_wds_netif_start_queue( ARG )
-#define WL_WDS_NETIF_STOP_QUEUE( ARG ) wl_wds_netif_stop_queue( ARG )
-#define WL_WDS_NETIF_WAKE_QUEUE( ARG ) wl_wds_netif_wake_queue( ARG )
-#define WL_WDS_NETIF_CARRIER_ON( ARG ) wl_wds_netif_carrier_on( ARG )
-#define WL_WDS_NETIF_CARRIER_OFF( ARG ) wl_wds_netif_carrier_off( ARG )
+#define WL_WDS_DEVICE_ALLOC(ARG) wl_wds_device_alloc(ARG)
+#define WL_WDS_DEVICE_DEALLOC(ARG) wl_wds_device_dealloc(ARG)
+#define WL_WDS_NETIF_START_QUEUE(ARG) wl_wds_netif_start_queue(ARG)
+#define WL_WDS_NETIF_STOP_QUEUE(ARG) wl_wds_netif_stop_queue(ARG)
+#define WL_WDS_NETIF_WAKE_QUEUE(ARG) wl_wds_netif_wake_queue(ARG)
+#define WL_WDS_NETIF_CARRIER_ON(ARG) wl_wds_netif_carrier_on(ARG)
+#define WL_WDS_NETIF_CARRIER_OFF(ARG) wl_wds_netif_carrier_off(ARG)
#else
-#define WL_WDS_DEVICE_ALLOC( ARG )
-#define WL_WDS_DEVICE_DEALLOC( ARG )
-#define WL_WDS_NETIF_START_QUEUE( ARG )
-#define WL_WDS_NETIF_STOP_QUEUE( ARG )
-#define WL_WDS_NETIF_WAKE_QUEUE( ARG )
-#define WL_WDS_NETIF_CARRIER_ON( ARG )
-#define WL_WDS_NETIF_CARRIER_OFF( ARG )
+#define WL_WDS_DEVICE_ALLOC(ARG)
+#define WL_WDS_DEVICE_DEALLOC(ARG)
+#define WL_WDS_NETIF_START_QUEUE(ARG)
+#define WL_WDS_NETIF_STOP_QUEUE(ARG)
+#define WL_WDS_NETIF_WAKE_QUEUE(ARG)
+#define WL_WDS_NETIF_CARRIER_ON(ARG)
+#define WL_WDS_NETIF_CARRIER_OFF(ARG)
#endif /* USE_WDS */
--
1.7.10.4
^ permalink raw reply related
* [PATCH 14/32] staging: wlags49_h2: wl_netdev.h: converts C99 // comments
From: Johan Meiring @ 2012-11-30 16:58 UTC (permalink / raw)
To: pe1dnn, jkosina, standby24x7, viro, gregkh
Cc: devel, linux-kernel, Johan Meiring
In-Reply-To: <1354294737-5735-1-git-send-email-johanmeiring@gmail.com>
This commit converts C99 // comments to /* */
Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
---
drivers/staging/wlags49_h2/wl_netdev.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/wlags49_h2/wl_netdev.h b/drivers/staging/wlags49_h2/wl_netdev.h
index 61f040f..78a7057 100644
--- a/drivers/staging/wlags49_h2/wl_netdev.h
+++ b/drivers/staging/wlags49_h2/wl_netdev.h
@@ -102,7 +102,7 @@ int wl_rx_dma( struct net_device *dev );
void wl_multicast( struct net_device *dev );
#else
void wl_multicast( struct net_device *dev, int num_addrs, void *addrs );
-#endif // NEW_MULTICAST
+#endif /* NEW_MULTICAST */
int wl_tx_port0( struct sk_buff *skb, struct net_device *dev );
@@ -151,4 +151,4 @@ void wl_wds_netif_carrier_off( struct wl_private *lp );
#endif /* USE_WDS */
-#endif // __WL_NETDEV_H__
+#endif /* __WL_NETDEV_H__ */
--
1.7.10.4
^ permalink raw reply related
* Re: "tuntap: multiqueue support" causes udev fork bombs
From: Jiri Slaby @ 2012-11-30 17:01 UTC (permalink / raw)
To: Jason Wang
Cc: David S. Miller, ML netdev, LKML, rmilasan, Jiri Slaby, maxk,
vtun
In-Reply-To: <4146845.d5imC0scLB@jason-thinkpad-t430s>
On 11/29/2012 06:47 AM, Jason Wang wrote:
> On Wednesday, November 28, 2012 11:25:41 AM Jiri Slaby wrote:
>> Hi,
>>
>> with this commit:
>> commit c8d68e6be1c3b242f1c598595830890b65cea64a
>> Author: Jason Wang <jasowang@redhat.com>
>> Date: Wed Oct 31 19:46:00 2012 +0000
>>
>> tuntap: multiqueue support
>>
>>
>> I see fork bombs from udev. It is trying to create 2048 processes. 1024
>> for tx, 1024 for rx. OOM killer indeed steps in and kills everything.
>
> Hi, thanks for the reporting, could you pls try the following patch?
Hi, it is gone with this patch.
> ---
>
> diff --git a/drivers/net/tun.c b/drivers/net/tun.c
> index b44d7b7..cc3f878 100644
> --- a/drivers/net/tun.c
> +++ b/drivers/net/tun.c
> @@ -492,9 +492,6 @@ static int tun_attach(struct tun_struct *tun, struct file *file)
>
> tun_set_real_num_queues(tun);
>
> - if (tun->numqueues == 1)
> - netif_carrier_on(tun->dev);
> -
> /* device is allowed to go away first, so no need to hold extra
> * refcnt.
> */
> @@ -1611,6 +1608,10 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
> TUN_USER_FEATURES;
> dev->features = dev->hw_features;
>
> + err = tun_attach(tun, file);
> + if (err < 0)
> + goto err_free_dev;
> +
> err = register_netdevice(tun->dev);
> if (err < 0)
> goto err_free_dev;
> @@ -1620,9 +1621,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
> device_create_file(&tun->dev->dev, &dev_attr_group))
> pr_err("Failed to create tun sysfs files\n");
>
> - err = tun_attach(tun, file);
> - if (err < 0)
> - goto err_free_dev;
> + netif_carrier_on(tun->dev);
> }
>
> tun_debug(KERN_INFO, tun, "tun_set_iff\n");
>
--
js
suse labs
^ permalink raw reply
* [PATCH 12/32] staging: wlags49_h2: wl_priv.h: converts C99 // comments
From: Johan Meiring @ 2012-11-30 16:58 UTC (permalink / raw)
To: pe1dnn, jkosina, standby24x7, viro, gregkh
Cc: devel, linux-kernel, Johan Meiring
In-Reply-To: <1354294737-5735-1-git-send-email-johanmeiring@gmail.com>
This commit converts C99 // comments to /* */
Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
---
drivers/staging/wlags49_h2/wl_priv.h | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/wlags49_h2/wl_priv.h b/drivers/staging/wlags49_h2/wl_priv.h
index aa1128a..daefc6c 100644
--- a/drivers/staging/wlags49_h2/wl_priv.h
+++ b/drivers/staging/wlags49_h2/wl_priv.h
@@ -83,7 +83,7 @@ int wvlan_set_porttype(struct net_device *, struct iw_request_info *, union iwre
int wvlan_get_porttype(struct net_device *, struct iw_request_info *, union iwreq_data *, char *extra);
-#endif // WIRELESS_EXT
+#endif /* WIRELESS_EXT */
@@ -92,19 +92,19 @@ int wvlan_get_porttype(struct net_device *, struct iw_request_info *, union iwre
int wvlan_uil(struct uilreq *urq, struct wl_private *lp);
-// int wvlan_uil_connect( struct uilreq *urq, struct wl_private *lp );
-// int wvlan_uil_disconnect( struct uilreq *urq, struct wl_private *lp );
-// int wvlan_uil_action( struct uilreq *urq, struct wl_private *lp );
-// int wvlan_uil_block( struct uilreq *urq, struct wl_private *lp );
-// int wvlan_uil_unblock( struct uilreq *urq, struct wl_private *lp );
-// int wvlan_uil_send_diag_msg( struct uilreq *urq, struct wl_private *lp );
-// int wvlan_uil_put_info( struct uilreq *urq, struct wl_private *lp );
-// int wvlan_uil_get_info( struct uilreq *urq, struct wl_private *lp );
+/* int wvlan_uil_connect( struct uilreq *urq, struct wl_private *lp ); */
+/* int wvlan_uil_disconnect( struct uilreq *urq, struct wl_private *lp ); */
+/* int wvlan_uil_action( struct uilreq *urq, struct wl_private *lp ); */
+/* int wvlan_uil_block( struct uilreq *urq, struct wl_private *lp ); */
+/* int wvlan_uil_unblock( struct uilreq *urq, struct wl_private *lp ); */
+/* int wvlan_uil_send_diag_msg( struct uilreq *urq, struct wl_private *lp ); */
+/* int wvlan_uil_put_info( struct uilreq *urq, struct wl_private *lp ); */
+/* int wvlan_uil_get_info( struct uilreq *urq, struct wl_private *lp ); */
-//int cfg_driver_info( struct uilreq *urq, struct wl_private *lp );
-//int cfg_driver_identity( struct uilreq *urq, struct wl_private *lp );
+/* int cfg_driver_info( struct uilreq *urq, struct wl_private *lp ); */
+/* int cfg_driver_identity( struct uilreq *urq, struct wl_private *lp ); */
-#endif // USE_UIL
+#endif /* USE_UIL */
#ifdef USE_RTS
@@ -115,7 +115,7 @@ int wvlan_rts_write(__u16 reg, __u16 val, __u32 io_base);
int wvlan_rts_batch_read(struct rtsreq *rrq, __u32 io_base);
int wvlan_rts_batch_write(struct rtsreq *rrq, __u32 io_base);
-#endif // USE_RTS
+#endif /* USE_RTS */
-#endif // __WL_PRIV_H__
+#endif /* __WL_PRIV_H__ */
--
1.7.10.4
^ permalink raw reply related
* [PATCH 11/32] staging: wlags49_h2: wl_priv.h: fixes spacing around parentheses
From: Johan Meiring @ 2012-11-30 16:58 UTC (permalink / raw)
To: pe1dnn, jkosina, standby24x7, viro, gregkh
Cc: devel, linux-kernel, Johan Meiring
In-Reply-To: <1354294737-5735-1-git-send-email-johanmeiring@gmail.com>
This commit fixes the incorrect spacing around parentheses.
Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
---
drivers/staging/wlags49_h2/wl_priv.h | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/wlags49_h2/wl_priv.h b/drivers/staging/wlags49_h2/wl_priv.h
index b647bfd..aa1128a 100644
--- a/drivers/staging/wlags49_h2/wl_priv.h
+++ b/drivers/staging/wlags49_h2/wl_priv.h
@@ -70,17 +70,17 @@
#ifdef WIRELESS_EXT
-int wvlan_set_netname( struct net_device *, struct iw_request_info *, union iwreq_data *, char *extra );
+int wvlan_set_netname(struct net_device *, struct iw_request_info *, union iwreq_data *, char *extra);
-int wvlan_get_netname( struct net_device *, struct iw_request_info *, union iwreq_data *, char *extra );
+int wvlan_get_netname(struct net_device *, struct iw_request_info *, union iwreq_data *, char *extra);
-int wvlan_set_station_nickname( struct net_device *, struct iw_request_info *, union iwreq_data *, char *extra );
+int wvlan_set_station_nickname(struct net_device *, struct iw_request_info *, union iwreq_data *, char *extra);
-int wvlan_get_station_nickname( struct net_device *, struct iw_request_info *, union iwreq_data *, char *extra );
+int wvlan_get_station_nickname(struct net_device *, struct iw_request_info *, union iwreq_data *, char *extra);
-int wvlan_set_porttype( struct net_device *, struct iw_request_info *, union iwreq_data *, char *extra );
+int wvlan_set_porttype(struct net_device *, struct iw_request_info *, union iwreq_data *, char *extra);
-int wvlan_get_porttype( struct net_device *, struct iw_request_info *, union iwreq_data *, char *extra );
+int wvlan_get_porttype(struct net_device *, struct iw_request_info *, union iwreq_data *, char *extra);
#endif // WIRELESS_EXT
@@ -90,7 +90,7 @@ int wvlan_get_porttype( struct net_device *, struct iw_request_info *, union iw
#ifdef USE_UIL
-int wvlan_uil( struct uilreq *urq, struct wl_private *lp );
+int wvlan_uil(struct uilreq *urq, struct wl_private *lp);
// int wvlan_uil_connect( struct uilreq *urq, struct wl_private *lp );
// int wvlan_uil_disconnect( struct uilreq *urq, struct wl_private *lp );
@@ -109,11 +109,11 @@ int wvlan_uil( struct uilreq *urq, struct wl_private *lp );
#ifdef USE_RTS
-int wvlan_rts( struct rtsreq *rrq, __u32 io_base );
-int wvlan_rts_read( __u16 reg, __u16 *val, __u32 io_base );
-int wvlan_rts_write( __u16 reg, __u16 val, __u32 io_base );
-int wvlan_rts_batch_read( struct rtsreq *rrq, __u32 io_base );
-int wvlan_rts_batch_write( struct rtsreq *rrq, __u32 io_base );
+int wvlan_rts(struct rtsreq *rrq, __u32 io_base);
+int wvlan_rts_read(__u16 reg, __u16 *val, __u32 io_base);
+int wvlan_rts_write(__u16 reg, __u16 val, __u32 io_base);
+int wvlan_rts_batch_read(struct rtsreq *rrq, __u32 io_base);
+int wvlan_rts_batch_write(struct rtsreq *rrq, __u32 io_base);
#endif // USE_RTS
--
1.7.10.4
^ permalink raw reply related
* [PATCH 10/32] staging: wlags49_h2: wl_enc: fixes incorrect use of return
From: Johan Meiring @ 2012-11-30 16:58 UTC (permalink / raw)
To: pe1dnn, jkosina, standby24x7, viro, gregkh
Cc: devel, linux-kernel, Johan Meiring
In-Reply-To: <1354294737-5735-1-git-send-email-johanmeiring@gmail.com>
This commit removes parentheses that were used as part of return
statements, seeing as how return is not a function.
Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
---
drivers/staging/wlags49_h2/wl_enc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/wlags49_h2/wl_enc.c b/drivers/staging/wlags49_h2/wl_enc.c
index 2cf3a113..51293d9 100644
--- a/drivers/staging/wlags49_h2/wl_enc.c
+++ b/drivers/staging/wlags49_h2/wl_enc.c
@@ -155,7 +155,7 @@ int wl_wep_code(char *szCrypt, char *szDest, void *Data, int nLen)
}
}
- return(strlen(szDest)) ;
+ return strlen(szDest);
}
/*============================================================================*/
@@ -225,7 +225,7 @@ int wl_wep_decode(char *szCrypt, void *Dest, char *szData)
}
- return(i) ;
+ return i;
}
/*============================================================================*/
--
1.7.10.4
^ permalink raw reply related
* [PATCH 09/32] staging: wlags49_h2: wl_enc: corrects spacing around colons
From: Johan Meiring @ 2012-11-30 16:58 UTC (permalink / raw)
To: pe1dnn, jkosina, standby24x7, viro, gregkh
Cc: devel, linux-kernel, Johan Meiring
In-Reply-To: <1354294737-5735-1-git-send-email-johanmeiring@gmail.com>
This commit fixes incorrect use of spaces around colons.
Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
---
drivers/staging/wlags49_h2/wl_enc.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wlags49_h2/wl_enc.c b/drivers/staging/wlags49_h2/wl_enc.c
index 1d143cd..2cf3a113 100644
--- a/drivers/staging/wlags49_h2/wl_enc.c
+++ b/drivers/staging/wlags49_h2/wl_enc.c
@@ -126,7 +126,7 @@ int wl_wep_code(char *szCrypt, char *szDest, void *Data, int nLen)
switch (i % 3) {
- case 0 :
+ case 0:
szDest[t] = ((k & 0xFC) >> 2) + CH_START ;
szDest[t+1] = ((k & 0x03) << 4) + CH_START ;
@@ -135,7 +135,7 @@ int wl_wep_code(char *szCrypt, char *szDest, void *Data, int nLen)
break;
- case 1 :
+ case 1:
szDest[t] += ((k & 0xF0) >> 4);
szDest[t+1] = ((k & 0x0F) << 2) + CH_START ;
@@ -144,7 +144,7 @@ int wl_wep_code(char *szCrypt, char *szDest, void *Data, int nLen)
break;
- case 2 :
+ case 2:
szDest[t] += ((k & 0xC0) >> 6);
szDest[t+1] = (k & 0x3F) + CH_START ;
@@ -201,20 +201,20 @@ int wl_wep_decode(char *szCrypt, void *Dest, char *szData)
for (i = t = 0; i < nLen; i++, t++) {
switch (i % 3) {
- case 0 :
+ case 0:
szDest[i] = (((szData[t] - CH_START) & 0x3f) << 2) +
(((szData[t+1] - CH_START) & 0x30) >> 4);
break;
- case 1 :
+ case 1:
szDest[i] = (((szData[t] - CH_START) & 0x0f) << 4) +
(((szData[t+1] - CH_START) & 0x3c) >> 2);
break;
- case 2 :
+ case 2:
szDest[i] = (((szData[t] - CH_START) & 0x03) << 6) +
((szData[t+1] - CH_START) & 0x3f);
t++;
--
1.7.10.4
^ permalink raw reply related
* [PATCH 08/32] staging: wlags49_h2: wl_enc: corrects spacing around parentheses
From: Johan Meiring @ 2012-11-30 16:58 UTC (permalink / raw)
To: pe1dnn, jkosina, standby24x7, viro, gregkh
Cc: devel, linux-kernel, Johan Meiring
In-Reply-To: <1354294737-5735-1-git-send-email-johanmeiring@gmail.com>
This commit corrects various instances where the use of spaces
around parentheses was incorrect.
Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
---
drivers/staging/wlags49_h2/wl_enc.c | 46 +++++++++++++++++------------------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/drivers/staging/wlags49_h2/wl_enc.c b/drivers/staging/wlags49_h2/wl_enc.c
index a62db46..1d143cd 100644
--- a/drivers/staging/wlags49_h2/wl_enc.c
+++ b/drivers/staging/wlags49_h2/wl_enc.c
@@ -105,7 +105,7 @@ extern dbg_info_t *DbgInfo;
* OK
*
******************************************************************************/
-int wl_wep_code( char *szCrypt, char *szDest, void *Data, int nLen )
+int wl_wep_code(char *szCrypt, char *szDest, void *Data, int nLen)
{
int i;
int t;
@@ -115,16 +115,16 @@ int wl_wep_code( char *szCrypt, char *szDest, void *Data, int nLen )
/*------------------------------------------------------------------------*/
- for( i = bits = 0 ; i < MACADDRESS_STR_LEN; i++ ) {
+ for (i = bits = 0; i < MACADDRESS_STR_LEN; i++) {
bits ^= szCrypt[i];
bits += szCrypt[i];
}
- for( i = t = *szDest = 0; i < nLen; i++, t++ ) {
- k = szData[i] ^ ( bits + i );
+ for (i = t = *szDest = 0; i < nLen; i++, t++) {
+ k = szData[i] ^ (bits + i);
- switch( i % 3 ) {
+ switch (i % 3) {
case 0 :
@@ -137,8 +137,8 @@ int wl_wep_code( char *szCrypt, char *szDest, void *Data, int nLen )
case 1 :
- szDest[t] += (( k & 0xF0 ) >> 4 );
- szDest[t+1] = (( k & 0x0F ) << 2 ) + CH_START ;
+ szDest[t] += ((k & 0xF0) >> 4);
+ szDest[t+1] = ((k & 0x0F) << 2) + CH_START ;
szDest[t+2] = '\0';
break;
@@ -146,8 +146,8 @@ int wl_wep_code( char *szCrypt, char *szDest, void *Data, int nLen )
case 2 :
- szDest[t] += (( k & 0xC0 ) >> 6 );
- szDest[t+1] = ( k & 0x3F ) + CH_START ;
+ szDest[t] += ((k & 0xC0) >> 6);
+ szDest[t+1] = (k & 0x3F) + CH_START ;
szDest[t+2] = '\0';
t++;
@@ -155,7 +155,7 @@ int wl_wep_code( char *szCrypt, char *szDest, void *Data, int nLen )
}
}
- return( strlen( szDest )) ;
+ return(strlen(szDest)) ;
}
/*============================================================================*/
@@ -182,7 +182,7 @@ int wl_wep_code( char *szCrypt, char *szDest, void *Data, int nLen )
* OK
*
******************************************************************************/
-int wl_wep_decode( char *szCrypt, void *Dest, char *szData )
+int wl_wep_decode(char *szCrypt, void *Dest, char *szData)
{
int i;
int t;
@@ -192,40 +192,40 @@ int wl_wep_decode( char *szCrypt, void *Dest, char *szData )
/*------------------------------------------------------------------------*/
- for( i = bits = 0 ; i < 12; i++ ) {
+ for (i = bits = 0; i < 12; i++) {
bits ^= szCrypt[i] ;
bits += szCrypt[i] ;
}
- nLen = ( strlen( szData ) * 3) / 4 ;
+ nLen = (strlen(szData) * 3) / 4 ;
- for( i = t = 0; i < nLen; i++, t++ ) {
- switch( i % 3 ) {
+ for (i = t = 0; i < nLen; i++, t++) {
+ switch (i % 3) {
case 0 :
- szDest[i] = ((( szData[t]-CH_START ) & 0x3f ) << 2 ) +
- ((( szData[t+1]-CH_START ) & 0x30 ) >> 4 );
+ szDest[i] = (((szData[t] - CH_START) & 0x3f) << 2) +
+ (((szData[t+1] - CH_START) & 0x30) >> 4);
break;
case 1 :
- szDest[i] = ((( szData[t]-CH_START ) & 0x0f ) << 4 ) +
- ((( szData[t+1]-CH_START ) & 0x3c ) >> 2 );
+ szDest[i] = (((szData[t] - CH_START) & 0x0f) << 4) +
+ (((szData[t+1] - CH_START) & 0x3c) >> 2);
break;
case 2 :
- szDest[i] = ((( szData[t]-CH_START ) & 0x03 ) << 6 ) +
- (( szData[t+1]-CH_START ) & 0x3f );
+ szDest[i] = (((szData[t] - CH_START) & 0x03) << 6) +
+ ((szData[t+1] - CH_START) & 0x3f);
t++;
break;
}
- szDest[i] ^= ( bits + i ) ;
+ szDest[i] ^= (bits + i);
}
- return( i ) ;
+ return(i) ;
}
/*============================================================================*/
--
1.7.10.4
^ permalink raw reply related
* [PATCH 06/32] staging: wlags49_h2: ap_h25: corrects incorrect use of // comments
From: Johan Meiring @ 2012-11-30 16:58 UTC (permalink / raw)
To: pe1dnn, jkosina, standby24x7, viro, gregkh
Cc: devel, linux-kernel, Johan Meiring
In-Reply-To: <1354294737-5735-1-git-send-email-johanmeiring@gmail.com>
This commit converts C99 // comments to /* */
Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
---
drivers/staging/wlags49_h2/ap_h25.c | 68 +++++++++++++++++------------------
1 file changed, 34 insertions(+), 34 deletions(-)
diff --git a/drivers/staging/wlags49_h2/ap_h25.c b/drivers/staging/wlags49_h2/ap_h25.c
index f578800..d3a0faa 100644
--- a/drivers/staging/wlags49_h2/ap_h25.c
+++ b/drivers/staging/wlags49_h2/ap_h25.c
@@ -24,10 +24,10 @@
*/
-#include "hcfcfg.h" // to get hcf_16 etc defined as well as
- // possible settings which inluence mdd.h or dhf.h
-#include "mdd.h" // to get COMP_ID_STA etc defined
-#include "dhf.h" // used to be fhfmem.h, to get memblock,plugrecord,
+#include "hcfcfg.h" /* to get hcf_16 etc defined as well as */
+ /* possible settings which inluence mdd.h or dhf.h */
+#include "mdd.h" /* to get COMP_ID_STA etc defined */
+#include "dhf.h" /* used to be fhfmem.h, to get memblock,plugrecord, */
static const hcf_8 fw_image_1_data[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -3999,56 +3999,56 @@ static const CFG_IDENTITY_STRCT fw_image_infoidentity[] = {
sizeof(CFG_IDENTITY_STRCT) / sizeof(hcf_16) - 1,
CFG_FW_IDENTITY,
COMP_ID_FW_AP,
- 3, //Variant
- 1, //Major
- 24 //Minor
+ 3, /* Variant */
+ 1, /* Major */
+ 24 /* Minor */
},
- { 0000, 0000, 0000, 0000, 0000, 0000 } //endsentinel
+ { 0000, 0000, 0000, 0000, 0000, 0000 } /* endsentinel */
};
static const CFG_PROG_STRCT fw_image_code[] = {
{
8,
CFG_PROG,
- CFG_PROG_VOLATILE, // mode
- 0x0148, // sizeof(fw_image_1_data),
- 0x00000060, // Target address in NIC Memory
- 0x0000, // CRC: yes/no TYPE: primary/station/tertiary
+ CFG_PROG_VOLATILE, /* mode */
+ 0x0148, /* sizeof(fw_image_1_data), */
+ 0x00000060, /* Target address in NIC Memory */
+ 0x0000, /* CRC: yes/no TYPE: primary/station/tertiary */
(hcf_8 *)fw_image_1_data
},
{
8,
CFG_PROG,
- CFG_PROG_VOLATILE, // mode
- 0x2432, // sizeof(fw_image_2_data),
- 0x00000C16, // Target address in NIC Memory
- 0x0000, // CRC: yes/no TYPE: primary/station/tertiary
+ CFG_PROG_VOLATILE, /* mode */
+ 0x2432, /* sizeof(fw_image_2_data), */
+ 0x00000C16, /* Target address in NIC Memory */
+ 0x0000, /* CRC: yes/no TYPE: primary/station/tertiary */
(hcf_8 *)fw_image_2_data
},
{
8,
CFG_PROG,
- CFG_PROG_VOLATILE, // mode
- 0x194c, // sizeof(fw_image_3_data),
- 0x001E3048, // Target address in NIC Memory
- 0x0000, // CRC: yes/no TYPE: primary/station/tertiary
+ CFG_PROG_VOLATILE, /* mode */
+ 0x194c, /* sizeof(fw_image_3_data), */
+ 0x001E3048, /* Target address in NIC Memory */
+ 0x0000, /* CRC: yes/no TYPE: primary/station/tertiary */
(hcf_8 *)fw_image_3_data
},
{
8,
CFG_PROG,
- CFG_PROG_VOLATILE, // mode
- 0xb7e4, // sizeof(fw_image_4_data),
- 0x001F4000, // Target address in NIC Memory
- 0x0000, // CRC: yes/no TYPE: primary/station/tertiary
+ CFG_PROG_VOLATILE, /* mode*/
+ 0xb7e4, /* sizeof(fw_image_4_data),*/
+ 0x001F4000, /* Target address in NIC Memory*/
+ 0x0000, /* CRC: yes/no TYPE: primary/station/tertiary*/
(hcf_8 *)fw_image_4_data
},
{
5,
CFG_PROG,
- CFG_PROG_STOP, // mode
+ CFG_PROG_STOP, /* mode*/
0000,
- 0x000F2101, // Start execution address
+ 0x000F2101, /* Start execution address*/
},
{ 0000, 0000, 0000, 0000, 00000000, 0000, 00000000}
};
@@ -4059,7 +4059,7 @@ static const CFG_RANGE20_STRCT fw_image_infocompat[] = {
COMP_ROLE_SUPL,
COMP_ID_APF,
{
- { 4, 1, 1 } //variant, bottom, top
+ { 4, 1, 1 } /* variant, bottom, top*/
}
},
{ 3 + ((20 * sizeof(CFG_RANGE_SPEC_STRCT)) / sizeof(hcf_16)),
@@ -4067,8 +4067,8 @@ static const CFG_RANGE20_STRCT fw_image_infocompat[] = {
COMP_ROLE_ACT,
COMP_ID_MFI,
{
- { 7, 3, 3 }, //variant, bottom, top
- { 8, 1, 1 } //variant, bottom, top
+ { 7, 3, 3 }, /* variant, bottom, top */
+ { 8, 1, 1 } /* variant, bottom, top */
}
},
{ 3 + ((20 * sizeof(CFG_RANGE_SPEC_STRCT)) / sizeof(hcf_16)),
@@ -4076,18 +4076,18 @@ static const CFG_RANGE20_STRCT fw_image_infocompat[] = {
COMP_ROLE_ACT,
COMP_ID_CFI,
{
- { 4, 1, 2 } //variant, bottom, top
+ { 4, 1, 2 } /* variant, bottom, top */
}
},
- { 0000, 0000, 0000, 0000, { { 0000, 0000, 0000 } } } //endsentinel
+ { 0000, 0000, 0000, 0000, { { 0000, 0000, 0000 } } } /* endsentinel */
};
memimage fw_image = {
- "FUPU7D37dhfwci\001C", //signature, <format number>, C/Bin type
+ "FUPU7D37dhfwci\001C", /* signature, <format number>, C/Bin type */
(CFG_PROG_STRCT *) fw_image_code,
0x000F2101,
- 00000000, //(dummy) pdaplug
- 00000000, //(dummy) priplug
+ 00000000, /* (dummy) pdaplug */
+ 00000000, /* (dummy) priplug */
(CFG_RANGE20_STRCT *) fw_image_infocompat,
(CFG_IDENTITY_STRCT *) fw_image_infoidentity,
};
--
1.7.10.4
^ permalink raw reply related
* [PATCH 05/32] staging: wlags49_h2: ap_h25: corrects casting styling issue
From: Johan Meiring @ 2012-11-30 16:58 UTC (permalink / raw)
To: pe1dnn, jkosina, standby24x7, viro, gregkh
Cc: devel, linux-kernel, Johan Meiring
In-Reply-To: <1354294737-5735-1-git-send-email-johanmeiring@gmail.com>
This commit corrects a casting styling issue as reported by the
checkpatch.pl tool.
Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
---
drivers/staging/wlags49_h2/ap_h25.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wlags49_h2/ap_h25.c b/drivers/staging/wlags49_h2/ap_h25.c
index 454d01b..f578800 100644
--- a/drivers/staging/wlags49_h2/ap_h25.c
+++ b/drivers/staging/wlags49_h2/ap_h25.c
@@ -4014,7 +4014,7 @@ static const CFG_PROG_STRCT fw_image_code[] = {
0x0148, // sizeof(fw_image_1_data),
0x00000060, // Target address in NIC Memory
0x0000, // CRC: yes/no TYPE: primary/station/tertiary
- (hcf_8 FAR *) fw_image_1_data
+ (hcf_8 *)fw_image_1_data
},
{
8,
@@ -4023,7 +4023,7 @@ static const CFG_PROG_STRCT fw_image_code[] = {
0x2432, // sizeof(fw_image_2_data),
0x00000C16, // Target address in NIC Memory
0x0000, // CRC: yes/no TYPE: primary/station/tertiary
- (hcf_8 FAR *) fw_image_2_data
+ (hcf_8 *)fw_image_2_data
},
{
8,
@@ -4032,7 +4032,7 @@ static const CFG_PROG_STRCT fw_image_code[] = {
0x194c, // sizeof(fw_image_3_data),
0x001E3048, // Target address in NIC Memory
0x0000, // CRC: yes/no TYPE: primary/station/tertiary
- (hcf_8 FAR *) fw_image_3_data
+ (hcf_8 *)fw_image_3_data
},
{
8,
@@ -4041,7 +4041,7 @@ static const CFG_PROG_STRCT fw_image_code[] = {
0xb7e4, // sizeof(fw_image_4_data),
0x001F4000, // Target address in NIC Memory
0x0000, // CRC: yes/no TYPE: primary/station/tertiary
- (hcf_8 FAR *) fw_image_4_data
+ (hcf_8 *)fw_image_4_data
},
{
5,
--
1.7.10.4
^ permalink raw reply related
* Re: [PATCH v2 3/3] pppoatm: protect against freeing of vcc
From: Krzysztof Mazur @ 2012-11-30 17:00 UTC (permalink / raw)
To: David Woodhouse
Cc: Chas Williams (CONTRACTOR), David Laight, davem, netdev,
linux-kernel, nathan
In-Reply-To: <1354292626.21562.298.camel@shinybook.infradead.org>
On Fri, Nov 30, 2012 at 04:23:46PM +0000, David Woodhouse wrote:
>
> +static void br2684_release_cb(struct atm_vcc *atmvcc)
> +{
> + struct br2684_vcc *brvcc = BR2684_VCC(atmvcc);
> +
> + /*
> + * A race with br2684_xmit_vcc() might cause a spurious wakeup just
> + * after that function *stops* the queue, and qspace might actually
> + * go negative before the queue stops again. We cope with that.
> + */
We cannot race with br2684_xmit_vcc() because both br2684_xmit_vcc()
and br2684_release_cb() are called with locked sk->sk_lock.slock.
> + if (atomic_read(&brvcc->qspace) > 0)
> + netif_wake_queue(brvcc->device);
> +
> + if (brvcc->old_release_cb)
> + brvcc->old_release_cb(atmvcc);
> +}
Except that comment, the patch looks good:
Acked-by: Krzysztof Mazur <krzysiek@podlesie.net>
Krzysiek
^ permalink raw reply
* [PATCH 03/32] staging: wlags49_h2: ap_h25: corrects parentheses styling issue
From: Johan Meiring @ 2012-11-30 16:58 UTC (permalink / raw)
To: pe1dnn, jkosina, standby24x7, viro, gregkh
Cc: devel, linux-kernel, Johan Meiring
In-Reply-To: <1354294737-5735-1-git-send-email-johanmeiring@gmail.com>
This commit corrects incorrect spaces around parentheses.
Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
---
drivers/staging/wlags49_h2/ap_h25.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/wlags49_h2/ap_h25.c b/drivers/staging/wlags49_h2/ap_h25.c
index f0fd34f..1c8f2be 100644
--- a/drivers/staging/wlags49_h2/ap_h25.c
+++ b/drivers/staging/wlags49_h2/ap_h25.c
@@ -3996,7 +3996,7 @@ static const hcf_8 fw_image_4_data[] = {
static const CFG_IDENTITY_STRCT fw_image_infoidentity[] = {
{
- sizeof( CFG_IDENTITY_STRCT ) / sizeof(hcf_16) - 1,
+ sizeof(CFG_IDENTITY_STRCT) / sizeof(hcf_16) - 1,
CFG_FW_IDENTITY,
COMP_ID_FW_AP,
3, //Variant
--
1.7.10.4
^ permalink raw reply related
* [PATCH 02/32] staging: wlags49_h2: ap_h25: corrects tabs/spaces syling issues
From: Johan Meiring @ 2012-11-30 16:58 UTC (permalink / raw)
To: pe1dnn, jkosina, standby24x7, viro, gregkh
Cc: devel, linux-kernel, Johan Meiring
In-Reply-To: <1354294737-5735-1-git-send-email-johanmeiring@gmail.com>
This commit corrects tabs and spaces issues as reported by the
checkpatch.pl tool.
Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
---
drivers/staging/wlags49_h2/ap_h25.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/wlags49_h2/ap_h25.c b/drivers/staging/wlags49_h2/ap_h25.c
index f4491cb..f0fd34f 100644
--- a/drivers/staging/wlags49_h2/ap_h25.c
+++ b/drivers/staging/wlags49_h2/ap_h25.c
@@ -24,10 +24,10 @@
*/
-#include "hcfcfg.h" // to get hcf_16 etc defined as well as
- // possible settings which inluence mdd.h or dhf.h
-#include "mdd.h" //to get COMP_ID_STA etc defined
-#include "dhf.h" //used to be "fhfmem.h", to get memblock,plugrecord,
+#include "hcfcfg.h" // to get hcf_16 etc defined as well as
+ // possible settings which inluence mdd.h or dhf.h
+#include "mdd.h" // to get COMP_ID_STA etc defined
+#include "dhf.h" // used to be "fhfmem.h", to get memblock,plugrecord,
static const hcf_8 fw_image_1_data[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -4048,7 +4048,7 @@ static const CFG_PROG_STRCT fw_image_code[] = {
CFG_PROG,
CFG_PROG_STOP, // mode
0000,
- 0x000F2101, // Start execution address
+ 0x000F2101, // Start execution address
},
{ 0000, 0000, 0000, 0000, 00000000, 0000, 00000000}
};
@@ -4059,7 +4059,7 @@ static const CFG_RANGE20_STRCT fw_image_infocompat[] = {
COMP_ROLE_SUPL,
COMP_ID_APF,
{
- { 4, 1, 1 } //variant, bottom, top
+ { 4, 1, 1 } //variant, bottom, top
}
},
{ 3 + ((20 * sizeof(CFG_RANGE_SPEC_STRCT)) / sizeof(hcf_16)),
@@ -4067,8 +4067,8 @@ static const CFG_RANGE20_STRCT fw_image_infocompat[] = {
COMP_ROLE_ACT,
COMP_ID_MFI,
{
- { 7, 3, 3 }, //variant, bottom, top
- { 8, 1, 1 } //variant, bottom, top
+ { 7, 3, 3 }, //variant, bottom, top
+ { 8, 1, 1 } //variant, bottom, top
}
},
{ 3 + ((20 * sizeof(CFG_RANGE_SPEC_STRCT)) / sizeof(hcf_16)),
@@ -4076,7 +4076,7 @@ static const CFG_RANGE20_STRCT fw_image_infocompat[] = {
COMP_ROLE_ACT,
COMP_ID_CFI,
{
- { 4, 1, 2 } //variant, bottom, top
+ { 4, 1, 2 } //variant, bottom, top
}
},
{ 0000, 0000, 0000, 0000, { { 0000, 0000, 0000 } } } //endsentinel
--
1.7.10.4
^ permalink raw reply related
* Re: [PATCH] clocksource: use clockevents_config_and_register() where possible
From: Maxime Ripard @ 2012-11-30 16:59 UTC (permalink / raw)
To: Shawn Guo
Cc: linux-kernel, linux-arm-kernel, John Stultz, Andres Salomon,
Nicolas Ferre
In-Reply-To: <1353936700-15255-1-git-send-email-shawn.guo@linaro.org>
Le 26/11/2012 14:31, Shawn Guo a écrit :
> The clockevent core is able to figure out the best mult and shift,
> calculate min_delta_ns and max_delta_ns, with the necessary info passed
> into clockevents_config_and_register(). Use this combined configure
> and register function where possible to make the codes less error prone
> and gain some positive diff stat.
>
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Maxime
--
Maxime Ripard, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* Re: linux-next: Tree for Nov 29 (netlabel)
From: Randy Dunlap @ 2012-11-30 16:55 UTC (permalink / raw)
To: Paul Moore
Cc: Stephen Rothwell, linux-next, linux-kernel,
netdev@vger.kernel.org, Casey Schaufler, linux-security-module
In-Reply-To: <2664553.2TRaVqlkGg@sifl>
On 11/30/2012 07:31 AM, Paul Moore wrote:
> On Friday, November 30, 2012 10:19:16 AM Paul Moore wrote:
>> On Thursday, November 29, 2012 04:05:26 PM Randy Dunlap wrote:
>>> On 11/28/2012 10:40 PM, Stephen Rothwell wrote:
>>>> Hi all,
>>>
>>>> Changes since 20121128:
>>> (on i386:)
>>
>> If I had to guess it looks like CONFIG_NETLABEL needs to be dependent on
>> CONFIG_INET. While the net/ Kconfig only pulls in the net/netlabel Kconfig
>> if CONFIG_INET is defined, I'm guessing that without the explicit
>> dependency there is nothing preventing someone from arriving at a bad
>> configuration as we see here.
>>
>> Let me test this out to make sure my reasoning is right and if it is I'll
>> post a patch to netdev later today.
>>
>> Thanks for catching this.
>
> Hmmm. The existing logic in net/Kconfig seems to disable CONFIG_NETLABEL at
> build time whenever CONFIG_INET is disabled in my .config file. The only way
> I can recreate what you are seeing here is if I move the NetLabel include
> outside of the INET conditional in net/Kconfig.
>
> Regardless, adding an explicit dependency on INET to NETLABEL shouldn't hurt
> anything so I'll go ahead and post the patch to netdev. Hopefully someone who
> understands Kconfig better than I do can help shed some light on this.
Sorry, this patch doesn't help.
I just checked the kernel .config again. SECURITY_SMACK
selects NETLABEL even when INET is not enabled. Bad SMACK.
I added Casey and mailing list to the cc:
>>> net/built-in.o: In function `netlbl_cfg_cipsov4_add':
>>> (.text+0x61757): undefined reference to `cipso_v4_doi_add'
>>> net/built-in.o: In function `netlbl_cfg_cipsov4_del':
>>> (.text+0x6177d): undefined reference to `cipso_v4_doi_remove'
>>> net/built-in.o: In function `netlbl_cfg_cipsov4_map_add':
>>> (.text+0x617ae): undefined reference to `cipso_v4_doi_getdef'
>>> net/built-in.o: In function `netlbl_cfg_cipsov4_map_add':
>>> (.text+0x61a49): undefined reference to `cipso_v4_doi_putdef'
>>> net/built-in.o: In function `netlbl_sock_setattr':
>>> (.text+0x6218c): undefined reference to `cipso_v4_sock_setattr'
>>> net/built-in.o: In function `netlbl_sock_delattr':
>>> (.text+0x6220b): undefined reference to `cipso_v4_sock_delattr'
>>> net/built-in.o: In function `netlbl_sock_getattr':
>>> (.text+0x62238): undefined reference to `cipso_v4_sock_getattr'
>>> net/built-in.o: In function `netlbl_conn_setattr':
>>> (.text+0x622de): undefined reference to `cipso_v4_sock_setattr'
>>> net/built-in.o: In function `netlbl_conn_setattr':
>>> (.text+0x62303): undefined reference to `cipso_v4_sock_delattr'
>>> net/built-in.o: In function `netlbl_req_setattr':
>>> (.text+0x62429): undefined reference to `cipso_v4_req_setattr'
>>> net/built-in.o: In function `netlbl_req_setattr':
>>> (.text+0x6244e): undefined reference to `cipso_v4_req_delattr'
>>> net/built-in.o: In function `netlbl_req_delattr':
>>> (.text+0x624ba): undefined reference to `cipso_v4_req_delattr'
>>> net/built-in.o: In function `netlbl_skbuff_setattr':
>>> (.text+0x62551): undefined reference to `cipso_v4_skbuff_setattr'
>>> net/built-in.o: In function `netlbl_skbuff_setattr':
>>> (.text+0x62576): undefined reference to `cipso_v4_skbuff_delattr'
>>> net/built-in.o: In function `netlbl_skbuff_getattr':
>>> (.text+0x62619): undefined reference to `cipso_v4_skbuff_getattr'
>>> net/built-in.o: In function `netlbl_skbuff_err':
>>> (.text+0x62685): undefined reference to `cipso_v4_error'
>>> net/built-in.o: In function `netlbl_cache_invalidate':
>>> (.text+0x626ab): undefined reference to `cipso_v4_cache_invalidate'
>>> net/built-in.o: In function `netlbl_cache_add':
>>> (.text+0x626ec): undefined reference to `cipso_v4_cache_add'
>>> net/built-in.o: In function `netlbl_domhsh_remove_entry':
>>> (.text+0x63294): undefined reference to `cipso_v4_doi_putdef'
>>> net/built-in.o: In function `netlbl_domhsh_remove_entry':
>>> (.text+0x632eb): undefined reference to `cipso_v4_doi_putdef'
>>> net/built-in.o: In function `netlbl_domhsh_remove_af4':
>>> (.text+0x6349b): undefined reference to `cipso_v4_doi_putdef'
>>> net/built-in.o: In function `netlbl_mgmt_add_common.clone.1':
>>> netlabel_mgmt.c:(.text+0x64a87): undefined reference to
>>> `cipso_v4_doi_getdef' netlabel_mgmt.c:(.text+0x64c83): undefined reference
>>> to `cipso_v4_doi_putdef' net/built-in.o: In function
>>> `netlbl_cipsov4_listall':
>>> netlabel_cipso_v4.c:(.text+0x66e52): undefined reference to
>>> `cipso_v4_doi_walk' net/built-in.o: In function `netlbl_cipsov4_list':
>>> netlabel_cipso_v4.c:(.text+0x67199): undefined reference to
>>> `cipso_v4_doi_getdef' net/built-in.o: In function `netlbl_cipsov4_remove':
>>> netlabel_cipso_v4.c:(.text+0x6771b): undefined reference to
>>> `cipso_v4_doi_remove' net/built-in.o: In function
>>> `netlbl_cipsov4_add_pass':
>>> netlabel_cipso_v4.c:(.text+0x67a4b): undefined reference to
>>> `cipso_v4_doi_add' netlabel_cipso_v4.c:(.text+0x67a76): undefined
>>> reference
>>> to `cipso_v4_doi_free' net/built-in.o: In function
>>> `netlbl_cipsov4_add_local':
>>> netlabel_cipso_v4.c:(.text+0x67b9a): undefined reference to
>>> `cipso_v4_doi_add' netlabel_cipso_v4.c:(.text+0x67bc5): undefined
>>> reference
>>> to `cipso_v4_doi_free' net/built-in.o: In function
>>> `netlbl_cipsov4_add_std':
>>> netlabel_cipso_v4.c:(.text+0x68535): undefined reference to
>>> `cipso_v4_doi_add' netlabel_cipso_v4.c:(.text+0x68575): undefined
>>> reference
>>> to `cipso_v4_doi_free'
>>>
>>>
>>> Full randconfig file is attached.
--
~Randy
^ permalink raw reply
* Re: [PATCH for 3.2.34] memcg: do not trigger OOM from add_to_page_cache_locked
From: Michal Hocko @ 2012-11-30 16:53 UTC (permalink / raw)
To: azurIt
Cc: linux-kernel, linux-mm, cgroups mailinglist, KAMEZAWA Hiroyuki,
Johannes Weiner
In-Reply-To: <20121130172651.B6917602@pobox.sk>
On Fri 30-11-12 17:26:51, azurIt wrote:
> >Could you also post your complete containers configuration, maybe there
> >is something strange in there (basically grep . -r YOUR_CGROUP_MNT
> >except for tasks files which are of no use right now).
>
>
> Here it is:
> http://www.watchdog.sk/lkml/cgroups.gz
The only strange thing I noticed is that some groups have 0 limit. Is
this intentional?
grep memory.limit_in_bytes cgroups | grep -v uid | sed 's@.*/@@' | sort | uniq -c
3 memory.limit_in_bytes:0
254 memory.limit_in_bytes:104857600
107 memory.limit_in_bytes:157286400
68 memory.limit_in_bytes:209715200
10 memory.limit_in_bytes:262144000
28 memory.limit_in_bytes:314572800
1 memory.limit_in_bytes:346030080
1 memory.limit_in_bytes:524288000
2 memory.limit_in_bytes:9223372036854775807
--
Michal Hocko
SUSE Labs
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox