Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 197408
b: refs/heads/master
c: 801de52
h: refs/heads/master
v: v3
  • Loading branch information
Prashant P. Shah authored and Greg Kroah-Hartman committed May 11, 2010
1 parent 3122ab9 commit 05803c2
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a9560a72759c6208c4072a30fb45aac7c6c014d4
refs/heads/master: 801de52358abc9f42ee6291dae2425bca04228d6
54 changes: 27 additions & 27 deletions trunk/drivers/staging/wlags49_h2/wl_profile.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@

#include <debug.h>
#include <hcf.h>
//#include <hcfdef.h>
/* #include <hcfdef.h> */

#include <wl_if.h>
#include <wl_internal.h>
Expand All @@ -118,17 +118,17 @@ int parse_yes_no(char *value);

int parse_yes_no(char *value)
{
int rc = 0; //default to NO for invalid parameters
int rc = 0; /* default to NO for invalid parameters */

if (strlen(value) == 1) {
if ((value[0] | ('Y'^'y')) == 'y')
rc = 1;
// } else {
// this should not be debug time info, it is an enduser data entry error ;?
// DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_MICROWAVE_ROBUSTNESS);
/* } else { */
/* this should not be debug time info, it is an enduser data entry error ;? */
/* DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_MICROWAVE_ROBUSTNESS); */
}
return rc;
} // parse_yes_no
} /* parse_yes_no */


/*******************************************************************************
Expand All @@ -154,10 +154,10 @@ int rc = 0; //default to NO for invalid parameters
void parse_config(struct net_device *dev)
{
int file_desc;
#if 0 // BIN_DL
#if 0 /* BIN_DL */
int rc;
char *cp = NULL;
#endif // BIN_DL
#endif /* BIN_DL */
char buffer[MAX_LINE_SIZE];
char filename[MAX_LINE_SIZE];
mm_segment_t fs;
Expand Down Expand Up @@ -192,7 +192,7 @@ void parse_config(struct net_device *dev)
while (readline(file_desc, buffer))
translate_option(buffer, wvlan_config);
/* Close the file */
close(file_desc); //;?even if file_desc == -1 ???
close(file_desc); /* ;?even if file_desc == -1 ??? */
} else {
DBG_TRACE(DbgInfo, "No iwconfig file found for this device; "
"config.opts or wireless.opts will be used\n");
Expand Down Expand Up @@ -235,19 +235,19 @@ void parse_config(struct net_device *dev)
memcpy(&wvlan_config->DefaultKeys, &sEncryption.EncStr,
sizeof(CFG_DEFAULT_KEYS_STRCT));

#if 0 //BIN_DL
#if 0 /* BIN_DL */
/* Obtain a user-space process context, storing the original context */
fs = get_fs();
set_fs(get_ds());

//;?just to fake something
/* ;?just to fake something */
strcpy(/*wvlan_config->fw_image_*/filename, "/etc/agere/fw.bin");
file_desc = open(/*wvlan_config->fw_image_*/filename, 0, 0);
if (file_desc == -1) {
DBG_ERROR(DbgInfo, "No image file found\n");
} else {
DBG_TRACE(DbgInfo, "F/W image file found\n");
#define DHF_ALLOC_SIZE 96000 //just below 96K, let's hope it suffices for now and for the future
#define DHF_ALLOC_SIZE 96000 /* just below 96K, let's hope it suffices for now and for the future */
cp = (char *)vmalloc(DHF_ALLOC_SIZE);
if (cp == NULL) {
DBG_ERROR(DbgInfo, "error in vmalloc\n");
Expand All @@ -270,11 +270,11 @@ void parse_config(struct net_device *dev)
close(file_desc);
}
set_fs(fs); /* Return to the original context */
#endif // BIN_DL
#endif /* BIN_DL */

DBG_LEAVE(DbgInfo);
return;
} // parse_config
} /* parse_config */

/*******************************************************************************
* readline()
Expand Down Expand Up @@ -322,7 +322,7 @@ int readline(int filedesc, char *buffer)
return result;
else
return bytes_read;
} // readline
} /* readline */
/*============================================================================*/

/*******************************************************************************
Expand Down Expand Up @@ -381,9 +381,9 @@ void translate_option(char *buffer, struct wl_private *lp)
DbgInfo->DebugFlag |= DBG_DEFAULTS;
}
} else {
DbgInfo->DebugFlag = simple_strtoul(value, NULL, 0); //;?DebugFlag;
DbgInfo->DebugFlag = simple_strtoul(value, NULL, 0); /* ;?DebugFlag; */
}
DbgInfo->DebugFlag = simple_strtoul(value, NULL, 0); //;?Delete ASAP
DbgInfo->DebugFlag = simple_strtoul(value, NULL, 0); /* ;?Delete ASAP */
}
#endif /* DBG */
if (strcmp(key, PARM_NAME_AUTH_KEY_MGMT_SUITE) == 0) {
Expand Down Expand Up @@ -602,10 +602,10 @@ void translate_option(char *buffer, struct wl_private *lp)
/* Need to add? : Country code, Short/Long retry */

/* Configuration parameters specific to STA mode */
#if 1 //;? (HCF_TYPE) & HCF_TYPE_STA
//;?seems reasonable that even an AP-only driver could afford this small additional footprint
#if 1 /* ;? (HCF_TYPE) & HCF_TYPE_STA */
/* ;?seems reasonable that even an AP-only driver could afford this small additional footprint */
if (CNV_INT_TO_LITTLE(lp->hcfCtx.IFB_FWIdentity.comp_id) == COMP_ID_FW_STA) {
//;?should we return an error status in AP mode
/* ;?should we return an error status in AP mode */
if (strcmp(key, PARM_NAME_PORT_TYPE) == 0) {
DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_PORT_TYPE, value);

Expand All @@ -625,7 +625,7 @@ void translate_option(char *buffer, struct wl_private *lp)
lp->PMEnabled = value_convert;
} else {
DBG_WARNING(DbgInfo, "%s invalid; will be ignored\n", PARM_NAME_PM_ENABLED);
//;?this is a data entry error, hence not a DBG_WARNING
/* ;?this is a data entry error, hence not a DBG_WARNING */
}
} else if (strcmp(key, PARM_NAME_CREATE_IBSS) == 0) {
DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_CREATE_IBSS, value);
Expand Down Expand Up @@ -690,8 +690,8 @@ void translate_option(char *buffer, struct wl_private *lp)
#endif /* (HCF_TYPE) & HCF_TYPE_STA */

/* Configuration parameters specific to AP mode */
#if 1 //;? (HCF_TYPE) & HCF_TYPE_AP
//;?should we restore this to allow smaller memory footprint
#if 1 /* ;? (HCF_TYPE) & HCF_TYPE_AP */
/* ;?should we restore this to allow smaller memory footprint */
if (CNV_INT_TO_LITTLE(lp->hcfCtx.IFB_FWIdentity.comp_id) == COMP_ID_FW_AP) {
if (strcmp(key, PARM_NAME_OWN_DTIM_PERIOD) == 0) {
DBG_TRACE(DbgInfo, "%s, value: %s\n", PARM_NAME_OWN_DTIM_PERIOD, value);
Expand Down Expand Up @@ -876,7 +876,7 @@ void translate_option(char *buffer, struct wl_private *lp)
#endif /* (HCF_TYPE) & HCF_TYPE_AP */

return;
} // translate_option
} /* translate_option */
/*============================================================================*/

/*******************************************************************************
Expand Down Expand Up @@ -932,7 +932,7 @@ int parse_mac_address(char *value, u_char *byte_array)
/* Use the array_offset as a check; 6 bytes should be written to the
byte_array */
return array_offset;
} // parse_mac_address
} /* parse_mac_address */
/*============================================================================*/

/*******************************************************************************
Expand Down Expand Up @@ -1006,7 +1006,7 @@ void ParseConfigLine(char *pszLine, char **ppszLVal, char **ppszRVal)
}
}
DBG_LEAVE(DbgInfo);
} // ParseConfigLine
} /* ParseConfigLine */
/*============================================================================*/

#endif // USE_PROFILE
#endif /* USE_PROFILE */

0 comments on commit 05803c2

Please sign in to comment.