diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
| commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
| tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/vt6655/iwctl.c | |
| parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
| parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
| download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz | |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6655/iwctl.c')
| -rw-r--r-- | drivers/staging/vt6655/iwctl.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/vt6655/iwctl.c b/drivers/staging/vt6655/iwctl.c index 4322761..92e3399 100644 --- a/drivers/staging/vt6655/iwctl.c +++ b/drivers/staging/vt6655/iwctl.c @@ -1900,7 +1900,7 @@ int iwctl_siwgenie(struct net_device *dev, } out://not completely ...not necessary in wpa_supplicant 0.5.8 - return 0; + return ret; } int iwctl_giwgenie(struct net_device *dev, @@ -2018,9 +2018,7 @@ param->u.wpa_key.seq_len = seq_len; #if 0 printk("param->u.wpa_key.alg_name =%d\n",param->u.wpa_key.alg_name); -printk("param->addr=%02x:%02x:%02x:%02x:%02x:%02x\n", - param->addr[0],param->addr[1],param->addr[2], - param->addr[3],param->addr[4],param->addr[5]); +printk(KERN_DEBUG "param->addr=%pM\n", param->addr); printk("param->u.wpa_key.set_tx =%d\n",param->u.wpa_key.set_tx); printk("param->u.wpa_key.key_index =%d\n",param->u.wpa_key.key_index); printk("param->u.wpa_key.key_len =%d\n",param->u.wpa_key.key_len); |
