Skip to content

L
linux
Commit 0ef48913 authored by Scott Matheina's avatar Scott Matheina Committed by Greg Kroah-Hartman
Browse files
Options

staging:vt6656:mac.c Aligned code to match open parenthesis 

Fixed Alignment should match open parenthesis checkpatch CHECK
Signed-off-by: default avatarScott Matheina <scott@matheina.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5e38e15e
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 20 deletions
drivers/staging/vt6656/mac.c
View file @ 0ef48913
...@@ -50,7 +50,7 @@ void vnt_mac_set_filter(struct vnt_private *priv, u64 mc_filter) ...@@ -50,7 +50,7 @@ void vnt_mac_set_filter(struct vnt_private *priv, u64 mc_filter)
__le64 le_mc = cpu_to_le64(mc_filter); __le64 le_mc = cpu_to_le64(mc_filter);
vnt_control_out(priv, MESSAGE_TYPE_WRITE, MAC_REG_MAR0, vnt_control_out(priv, MESSAGE_TYPE_WRITE, MAC_REG_MAR0,
MESSAGE_REQUEST_MACREG, sizeof(le_mc), (u8 *)&le_mc); MESSAGE_REQUEST_MACREG, sizeof(le_mc), (u8 *)&le_mc);
} }
/* /*
...@@ -77,7 +77,7 @@ void vnt_mac_set_bb_type(struct vnt_private *priv, u8 type) ...@@ -77,7 +77,7 @@ void vnt_mac_set_bb_type(struct vnt_private *priv, u8 type)
data[1] = EnCFG_BBType_MASK; data[1] = EnCFG_BBType_MASK;
vnt_control_out(priv, MESSAGE_TYPE_WRITE_MASK, MAC_REG_ENCFG0, vnt_control_out(priv, MESSAGE_TYPE_WRITE_MASK, MAC_REG_ENCFG0,
MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data); MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data);
} }
/* /*
...@@ -97,7 +97,7 @@ void vnt_mac_set_bb_type(struct vnt_private *priv, u8 type) ...@@ -97,7 +97,7 @@ void vnt_mac_set_bb_type(struct vnt_private *priv, u8 type)
void vnt_mac_disable_keyentry(struct vnt_private *priv, u8 entry_idx) void vnt_mac_disable_keyentry(struct vnt_private *priv, u8 entry_idx)
{ {
vnt_control_out(priv, MESSAGE_TYPE_CLRKEYENTRY, 0, 0, vnt_control_out(priv, MESSAGE_TYPE_CLRKEYENTRY, 0, 0,
sizeof(entry_idx), &entry_idx); sizeof(entry_idx), &entry_idx);
} }
/* /*
...@@ -115,7 +115,7 @@ void vnt_mac_disable_keyentry(struct vnt_private *priv, u8 entry_idx) ...@@ -115,7 +115,7 @@ void vnt_mac_disable_keyentry(struct vnt_private *priv, u8 entry_idx)
* *
*/ */
void vnt_mac_set_keyentry(struct vnt_private *priv, u16 key_ctl, u32 entry_idx, void vnt_mac_set_keyentry(struct vnt_private *priv, u16 key_ctl, u32 entry_idx,
u32 key_idx, u8 *addr, u8 *key) u32 key_idx, u8 *addr, u8 *key)
{ {
struct vnt_mac_set_key set_key; struct vnt_mac_set_key set_key;
u16 offset; u16 offset;
...@@ -132,10 +132,11 @@ void vnt_mac_set_keyentry(struct vnt_private *priv, u16 key_ctl, u32 entry_idx, ...@@ -132,10 +132,11 @@ void vnt_mac_set_keyentry(struct vnt_private *priv, u16 key_ctl, u32 entry_idx,
memcpy(set_key.key, key, WLAN_KEY_LEN_CCMP); memcpy(set_key.key, key, WLAN_KEY_LEN_CCMP);
dev_dbg(&priv->usb->dev, "offset %d key ctl %d set key %24ph\n", dev_dbg(&priv->usb->dev, "offset %d key ctl %d set key %24ph\n",
offset, key_ctl, (u8 *)&set_key); offset, key_ctl, (u8 *)&set_key);
vnt_control_out(priv, MESSAGE_TYPE_SETKEY, offset, vnt_control_out(priv, MESSAGE_TYPE_SETKEY, offset,
(u16)key_idx, sizeof(struct vnt_mac_set_key), (u8 *)&set_key); (u16)key_idx, sizeof(struct vnt_mac_set_key),
(u8 *)&set_key);
} }
void vnt_mac_reg_bits_off(struct vnt_private *priv, u8 reg_ofs, u8 bits) void vnt_mac_reg_bits_off(struct vnt_private *priv, u8 reg_ofs, u8 bits)
...@@ -146,7 +147,8 @@ void vnt_mac_reg_bits_off(struct vnt_private *priv, u8 reg_ofs, u8 bits) ...@@ -146,7 +147,8 @@ void vnt_mac_reg_bits_off(struct vnt_private *priv, u8 reg_ofs, u8 bits)
data[1] = bits; data[1] = bits;
vnt_control_out(priv, MESSAGE_TYPE_WRITE_MASK, vnt_control_out(priv, MESSAGE_TYPE_WRITE_MASK,
reg_ofs, MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data); reg_ofs, MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data),
data);
} }
void vnt_mac_reg_bits_on(struct vnt_private *priv, u8 reg_ofs, u8 bits) void vnt_mac_reg_bits_on(struct vnt_private *priv, u8 reg_ofs, u8 bits)
...@@ -156,8 +158,8 @@ void vnt_mac_reg_bits_on(struct vnt_private *priv, u8 reg_ofs, u8 bits) ...@@ -156,8 +158,8 @@ void vnt_mac_reg_bits_on(struct vnt_private *priv, u8 reg_ofs, u8 bits)
data[0] = bits; data[0] = bits;
data[1] = bits; data[1] = bits;
vnt_control_out(priv, MESSAGE_TYPE_WRITE_MASK, vnt_control_out(priv, MESSAGE_TYPE_WRITE_MASK, reg_ofs,
reg_ofs, MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data); MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data);
} }
void vnt_mac_write_word(struct vnt_private *priv, u8 reg_ofs, u16 word) void vnt_mac_write_word(struct vnt_private *priv, u8 reg_ofs, u16 word)
...@@ -174,7 +176,7 @@ void vnt_mac_write_word(struct vnt_private *priv, u8 reg_ofs, u16 word) ...@@ -174,7 +176,7 @@ void vnt_mac_write_word(struct vnt_private *priv, u8 reg_ofs, u16 word)
void vnt_mac_set_bssid_addr(struct vnt_private *priv, u8 *addr) void vnt_mac_set_bssid_addr(struct vnt_private *priv, u8 *addr)
{ {
vnt_control_out(priv, MESSAGE_TYPE_WRITE, MAC_REG_BSSID0, vnt_control_out(priv, MESSAGE_TYPE_WRITE, MAC_REG_BSSID0,
MESSAGE_REQUEST_MACREG, ETH_ALEN, addr); MESSAGE_REQUEST_MACREG, ETH_ALEN, addr);
} }
void vnt_mac_enable_protect_mode(struct vnt_private *priv) void vnt_mac_enable_protect_mode(struct vnt_private *priv)
...@@ -184,8 +186,8 @@ void vnt_mac_enable_protect_mode(struct vnt_private *priv) ...@@ -184,8 +186,8 @@ void vnt_mac_enable_protect_mode(struct vnt_private *priv)
data[0] = EnCFG_ProtectMd; data[0] = EnCFG_ProtectMd;
data[1] = EnCFG_ProtectMd; data[1] = EnCFG_ProtectMd;
vnt_control_out(priv, MESSAGE_TYPE_WRITE_MASK, vnt_control_out(priv, MESSAGE_TYPE_WRITE_MASK, MAC_REG_ENCFG0,
MAC_REG_ENCFG0, MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data); MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data);
} }
void vnt_mac_disable_protect_mode(struct vnt_private *priv) void vnt_mac_disable_protect_mode(struct vnt_private *priv)
...@@ -195,8 +197,8 @@ void vnt_mac_disable_protect_mode(struct vnt_private *priv) ...@@ -195,8 +197,8 @@ void vnt_mac_disable_protect_mode(struct vnt_private *priv)
data[0] = 0; data[0] = 0;
data[1] = EnCFG_ProtectMd; data[1] = EnCFG_ProtectMd;
vnt_control_out(priv, MESSAGE_TYPE_WRITE_MASK, vnt_control_out(priv, MESSAGE_TYPE_WRITE_MASK, MAC_REG_ENCFG0,
MAC_REG_ENCFG0, MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data); MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data);
} }
void vnt_mac_enable_barker_preamble_mode(struct vnt_private *priv) void vnt_mac_enable_barker_preamble_mode(struct vnt_private *priv)
...@@ -206,8 +208,8 @@ void vnt_mac_enable_barker_preamble_mode(struct vnt_private *priv) ...@@ -206,8 +208,8 @@ void vnt_mac_enable_barker_preamble_mode(struct vnt_private *priv)
data[0] = EnCFG_BarkerPream; data[0] = EnCFG_BarkerPream;
data[1] = EnCFG_BarkerPream; data[1] = EnCFG_BarkerPream;
vnt_control_out(priv, MESSAGE_TYPE_WRITE_MASK, vnt_control_out(priv, MESSAGE_TYPE_WRITE_MASK, MAC_REG_ENCFG2,
MAC_REG_ENCFG2, MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data); MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data);
} }
void vnt_mac_disable_barker_preamble_mode(struct vnt_private *priv) void vnt_mac_disable_barker_preamble_mode(struct vnt_private *priv)
...@@ -217,8 +219,8 @@ void vnt_mac_disable_barker_preamble_mode(struct vnt_private *priv) ...@@ -217,8 +219,8 @@ void vnt_mac_disable_barker_preamble_mode(struct vnt_private *priv)
data[0] = 0; data[0] = 0;
data[1] = EnCFG_BarkerPream; data[1] = EnCFG_BarkerPream;
vnt_control_out(priv, MESSAGE_TYPE_WRITE_MASK, vnt_control_out(priv, MESSAGE_TYPE_WRITE_MASK, MAC_REG_ENCFG2,
MAC_REG_ENCFG2, MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data); MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data);
} }
void vnt_mac_set_beacon_interval(struct vnt_private *priv, u16 interval) void vnt_mac_set_beacon_interval(struct vnt_private *priv, u16 interval)
...@@ -228,8 +230,8 @@ void vnt_mac_set_beacon_interval(struct vnt_private *priv, u16 interval) ...@@ -228,8 +230,8 @@ void vnt_mac_set_beacon_interval(struct vnt_private *priv, u16 interval)
data[0] = (u8)(interval & 0xff); data[0] = (u8)(interval & 0xff);
data[1] = (u8)(interval >> 8); data[1] = (u8)(interval >> 8);
vnt_control_out(priv, MESSAGE_TYPE_WRITE, vnt_control_out(priv, MESSAGE_TYPE_WRITE, MAC_REG_BI,
MAC_REG_BI, MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data); MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data);
} }
void vnt_mac_set_led(struct vnt_private *priv, u8 state, u8 led) void vnt_mac_set_led(struct vnt_private *priv, u8 state, u8 led)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7