diff options
| author | Malcolm Priestley | 2014-07-19 13:30:06 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-07-21 21:11:56 +0200 |
| commit | f1945a15d6ace5420a55d14ba60a2bcdc3653b50 (patch) | |
| tree | 3e371bb8dc28685bbfe9fc88d6ecf8e9f4c254f2 | |
| parent | staging: vt6656: struct vnt_private rename wFirmwareVersion to firmware_version (diff) | |
| download | kernel-qcow2-linux-f1945a15d6ace5420a55d14ba60a2bcdc3653b50.tar.gz kernel-qcow2-linux-f1945a15d6ace5420a55d14ba60a2bcdc3653b50.tar.xz kernel-qcow2-linux-f1945a15d6ace5420a55d14ba60a2bcdc3653b50.zip | |
staging: vt6656: struct vnt_private rename byLocalID to local_id
Removing camel case
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/vt6656/device.h | 2 | ||||
| -rw-r--r-- | drivers/staging/vt6656/dpc.c | 2 | ||||
| -rw-r--r-- | drivers/staging/vt6656/key.c | 2 | ||||
| -rw-r--r-- | drivers/staging/vt6656/main_usb.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index b9f48416d4d1..c1d0551d103a 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h @@ -300,7 +300,7 @@ struct vnt_private { /* Version control */ u16 firmware_version; - u8 byLocalID; + u8 local_id; u8 byRFType; u8 byBBRxConf; diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c index f3da0db77c04..5d4c2c1e6716 100644 --- a/drivers/staging/vt6656/dpc.c +++ b/drivers/staging/vt6656/dpc.c @@ -175,7 +175,7 @@ int vnt_rx_data(struct vnt_private *priv, struct vnt_rcb *ptr_rcb, rx_status.rate_idx = rate_idx; if (ieee80211_has_protected(fc)) { - if (priv->byLocalID > REV_ID_VT3253_A1) { + if (priv->local_id > REV_ID_VT3253_A1) { rx_status.flag |= RX_FLAG_DECRYPTED; /* Drop packet */ diff --git a/drivers/staging/vt6656/key.c b/drivers/staging/vt6656/key.c index b76ee3106d5f..22f2961d2225 100644 --- a/drivers/staging/vt6656/key.c +++ b/drivers/staging/vt6656/key.c @@ -158,7 +158,7 @@ int vnt_set_keys(struct ieee80211_hw *hw, struct ieee80211_sta *sta, break; case WLAN_CIPHER_SUITE_CCMP: - if (priv->byLocalID <= MAC_REVISION_A1) + if (priv->local_id <= MAC_REVISION_A1) return -EINVAL; key_dec_mode = KEY_CTL_CCMP; diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index ba2467c95781..9974bab468c4 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -189,7 +189,7 @@ static int device_init_registers(struct vnt_private *priv) /* local ID for AES functions */ status = vnt_control_in(priv, MESSAGE_TYPE_READ, MAC_REG_LOCALID, MESSAGE_REQUEST_MACREG, 1, - &priv->byLocalID); + &priv->local_id); if (status != STATUS_SUCCESS) return false; |