diff --git a/[refs] b/[refs] index e711b9be74a4..78ade7fc4cd8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97d2354518897cfc42740637e6390eaa23e3d206 +refs/heads/master: e7cde7b31271155e5fb896a325bea38e9e604806 diff --git a/trunk/drivers/staging/vt6655/iwctl.c b/trunk/drivers/staging/vt6655/iwctl.c index d74b7448b25b..92e33999054b 100644 --- a/trunk/drivers/staging/vt6655/iwctl.c +++ b/trunk/drivers/staging/vt6655/iwctl.c @@ -2018,7 +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(KERN_DEBUG "param->addr=%pM\n", ¶m->addr[0]); +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); diff --git a/trunk/drivers/staging/vt6655/vntwifi.c b/trunk/drivers/staging/vt6655/vntwifi.c index db9cbe9dfa6c..0491d0b52c85 100644 --- a/trunk/drivers/staging/vt6655/vntwifi.c +++ b/trunk/drivers/staging/vt6655/vntwifi.c @@ -566,8 +566,7 @@ VNTWIFIvGetTxRate( wTxDataRate = (pMgmt->sNodeDBTable[0].wTxDataRate); #ifdef PLICE_DEBUG printk(KERN_DEBUG "GetTxRate:AP MAC is %pM,TxRate is %d\n", - &pMgmt->sNodeDBTable[0].abyMACAddr[0], - wTxDataRate); + pMgmt->sNodeDBTable[0].abyMACAddr, wTxDataRate); #endif