drivers: wireless: use new hex_to_bin() method
Instead of using own implementation involve hex_to_bin() function. Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko@nokia.com> Acked-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
91f06e6680
commit
26355387c2
|
@ -5162,13 +5162,6 @@ static void proc_SSID_on_close(struct inode *inode, struct file *file)
|
||||||
enable_MAC(ai, 1);
|
enable_MAC(ai, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline u8 hexVal(char c) {
|
|
||||||
if (c>='0' && c<='9') return c -= '0';
|
|
||||||
if (c>='a' && c<='f') return c -= 'a'-10;
|
|
||||||
if (c>='A' && c<='F') return c -= 'A'-10;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void proc_APList_on_close( struct inode *inode, struct file *file ) {
|
static void proc_APList_on_close( struct inode *inode, struct file *file ) {
|
||||||
struct proc_data *data = (struct proc_data *)file->private_data;
|
struct proc_data *data = (struct proc_data *)file->private_data;
|
||||||
struct proc_dir_entry *dp = PDE(inode);
|
struct proc_dir_entry *dp = PDE(inode);
|
||||||
|
@ -5188,11 +5181,11 @@ static void proc_APList_on_close( struct inode *inode, struct file *file ) {
|
||||||
switch(j%3) {
|
switch(j%3) {
|
||||||
case 0:
|
case 0:
|
||||||
APList_rid.ap[i][j/3]=
|
APList_rid.ap[i][j/3]=
|
||||||
hexVal(data->wbuffer[j+i*6*3])<<4;
|
hex_to_bin(data->wbuffer[j+i*6*3])<<4;
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
APList_rid.ap[i][j/3]|=
|
APList_rid.ap[i][j/3]|=
|
||||||
hexVal(data->wbuffer[j+i*6*3]);
|
hex_to_bin(data->wbuffer[j+i*6*3]);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -5340,10 +5333,10 @@ static void proc_wepkey_on_close( struct inode *inode, struct file *file ) {
|
||||||
for( i = 0; i < 16*3 && data->wbuffer[i+j]; i++ ) {
|
for( i = 0; i < 16*3 && data->wbuffer[i+j]; i++ ) {
|
||||||
switch(i%3) {
|
switch(i%3) {
|
||||||
case 0:
|
case 0:
|
||||||
key[i/3] = hexVal(data->wbuffer[i+j])<<4;
|
key[i/3] = hex_to_bin(data->wbuffer[i+j])<<4;
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
key[i/3] |= hexVal(data->wbuffer[i+j]);
|
key[i/3] |= hex_to_bin(data->wbuffer[i+j]);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue