Commit 92f6de43 authored by Ajay Singh's avatar Ajay Singh Committed by Greg Kroah-Hartman

staging: wilc1000: make use of get_unaligned_le16/le32 to pack data

Make use of get_unaligned_le16/le32 framework api's to pack data.
Signed-off-by: default avatarAjay Singh <ajay.kathat@microchip.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2e1d6637
...@@ -2154,10 +2154,7 @@ void wilc_network_info_received(struct wilc *wilc, u8 *buffer, u32 length) ...@@ -2154,10 +2154,7 @@ void wilc_network_info_received(struct wilc *wilc, u8 *buffer, u32 length)
struct host_if_drv *hif_drv; struct host_if_drv *hif_drv;
struct wilc_vif *vif; struct wilc_vif *vif;
id = buffer[length - 4]; id = get_unaligned_le32(&buffer[length - 4]);
id |= (buffer[length - 3] << 8);
id |= (buffer[length - 2] << 16);
id |= (buffer[length - 1] << 24);
vif = wilc_get_vif_from_idx(wilc, id); vif = wilc_get_vif_from_idx(wilc, id);
if (!vif) if (!vif)
return; return;
...@@ -2197,10 +2194,7 @@ void wilc_gnrl_async_info_received(struct wilc *wilc, u8 *buffer, u32 length) ...@@ -2197,10 +2194,7 @@ void wilc_gnrl_async_info_received(struct wilc *wilc, u8 *buffer, u32 length)
mutex_lock(&hif_deinit_lock); mutex_lock(&hif_deinit_lock);
id = buffer[length - 4]; id = get_unaligned_le32(&buffer[length - 4]);
id |= (buffer[length - 3] << 8);
id |= (buffer[length - 2] << 16);
id |= (buffer[length - 1] << 24);
vif = wilc_get_vif_from_idx(wilc, id); vif = wilc_get_vif_from_idx(wilc, id);
if (!vif) { if (!vif) {
mutex_unlock(&hif_deinit_lock); mutex_unlock(&hif_deinit_lock);
...@@ -2251,10 +2245,7 @@ void wilc_scan_complete_received(struct wilc *wilc, u8 *buffer, u32 length) ...@@ -2251,10 +2245,7 @@ void wilc_scan_complete_received(struct wilc *wilc, u8 *buffer, u32 length)
struct host_if_drv *hif_drv; struct host_if_drv *hif_drv;
struct wilc_vif *vif; struct wilc_vif *vif;
id = buffer[length - 4]; id = get_unaligned_le32(&buffer[length - 4]);
id |= buffer[length - 3] << 8;
id |= buffer[length - 2] << 16;
id |= buffer[length - 1] << 24;
vif = wilc_get_vif_from_idx(wilc, id); vif = wilc_get_vif_from_idx(wilc, id);
if (!vif) if (!vif)
return; return;
......
...@@ -168,7 +168,7 @@ static void wilc_wlan_parse_response_frame(struct wilc *wl, u8 *info, int size) ...@@ -168,7 +168,7 @@ static void wilc_wlan_parse_response_frame(struct wilc *wl, u8 *info, int size)
while (size > 0) { while (size > 0) {
i = 0; i = 0;
wid = info[0] | (info[1] << 8); wid = get_unaligned_le16(info);
switch (GET_WID_TYPE(wid)) { switch (GET_WID_TYPE(wid)) {
case WID_CHAR: case WID_CHAR:
...@@ -187,12 +187,13 @@ static void wilc_wlan_parse_response_frame(struct wilc *wl, u8 *info, int size) ...@@ -187,12 +187,13 @@ static void wilc_wlan_parse_response_frame(struct wilc *wl, u8 *info, int size)
case WID_SHORT: case WID_SHORT:
do { do {
if (wl->cfg.hw[i].id == WID_NIL) struct wilc_cfg_hword *hw = &wl->cfg.hw[i];
if (hw->id == WID_NIL)
break; break;
if (wl->cfg.hw[i].id == wid) { if (hw->id == wid) {
wl->cfg.hw[i].val = (info[4] | hw->val = get_unaligned_le16(&info[4]);
(info[5] << 8));
break; break;
} }
i++; i++;
...@@ -202,14 +203,13 @@ static void wilc_wlan_parse_response_frame(struct wilc *wl, u8 *info, int size) ...@@ -202,14 +203,13 @@ static void wilc_wlan_parse_response_frame(struct wilc *wl, u8 *info, int size)
case WID_INT: case WID_INT:
do { do {
if (wl->cfg.w[i].id == WID_NIL) struct wilc_cfg_word *w = &wl->cfg.w[i];
if (w->id == WID_NIL)
break; break;
if (wl->cfg.w[i].id == wid) { if (w->id == wid) {
wl->cfg.w[i].val = (info[4] | w->val = get_unaligned_le32(&info[4]);
(info[5] << 8) |
(info[6] << 16) |
(info[7] << 24));
break; break;
} }
i++; i++;
...@@ -244,7 +244,7 @@ static void wilc_wlan_parse_info_frame(struct wilc *wl, u8 *info) ...@@ -244,7 +244,7 @@ static void wilc_wlan_parse_info_frame(struct wilc *wl, u8 *info)
{ {
u32 wid, len; u32 wid, len;
wid = info[0] | (info[1] << 8); wid = get_unaligned_le16(info);
len = info[2]; len = info[2];
...@@ -371,8 +371,7 @@ int wilc_wlan_cfg_get_wid_value(struct wilc *wl, u16 wid, u8 *buffer, ...@@ -371,8 +371,7 @@ int wilc_wlan_cfg_get_wid_value(struct wilc *wl, u16 wid, u8 *buffer,
break; break;
if (id == wid) { if (id == wid) {
u32 size = (wl->cfg.s[i].str[0] | u16 size = get_unaligned_le16(wl->cfg.s[i].str);
(wl->cfg.s[i].str[1] << 8));
if (buffer_size >= size) { if (buffer_size >= size) {
memcpy(buffer, &wl->cfg.s[i].str[2], memcpy(buffer, &wl->cfg.s[i].str[2],
......
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