Commit 8e55639d authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman

staging: wilc1000: rename tcp_PendingAck_index of struct txq_entry_t

This patch renames tcp_PendingAck_index of struct txq_entry_t to index
to avoid CamelCase naming convention.
Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 66a43a91
...@@ -251,7 +251,7 @@ static inline int add_tcp_pending_ack(u32 ack, u32 session_index, ...@@ -251,7 +251,7 @@ static inline int add_tcp_pending_ack(u32 ack, u32 session_index,
pending_acks_info[pending_base + pending_acks].ack_num = ack; pending_acks_info[pending_base + pending_acks].ack_num = ack;
pending_acks_info[pending_base + pending_acks].txqe = txqe; pending_acks_info[pending_base + pending_acks].txqe = txqe;
pending_acks_info[pending_base + pending_acks].session_index = session_index; pending_acks_info[pending_base + pending_acks].session_index = session_index;
txqe->tcp_PendingAck_index = pending_base + pending_acks; txqe->index = pending_base + pending_acks;
pending_acks++; pending_acks++;
} }
return 0; return 0;
...@@ -422,7 +422,7 @@ static int wilc_wlan_txq_add_cfg_pkt(u8 *buffer, u32 buffer_size) ...@@ -422,7 +422,7 @@ static int wilc_wlan_txq_add_cfg_pkt(u8 *buffer, u32 buffer_size)
tqe->tx_complete_func = NULL; tqe->tx_complete_func = NULL;
tqe->priv = NULL; tqe->priv = NULL;
#ifdef TCP_ACK_FILTER #ifdef TCP_ACK_FILTER
tqe->tcp_PendingAck_index = NOT_TCP_ACK; tqe->index = NOT_TCP_ACK;
#endif #endif
PRINT_D(TX_DBG, "Adding the config packet at the Queue tail\n"); PRINT_D(TX_DBG, "Adding the config packet at the Queue tail\n");
...@@ -452,7 +452,7 @@ int wilc_wlan_txq_add_net_pkt(struct net_device *dev, void *priv, u8 *buffer, ...@@ -452,7 +452,7 @@ int wilc_wlan_txq_add_net_pkt(struct net_device *dev, void *priv, u8 *buffer,
PRINT_D(TX_DBG, "Adding mgmt packet at the Queue tail\n"); PRINT_D(TX_DBG, "Adding mgmt packet at the Queue tail\n");
#ifdef TCP_ACK_FILTER #ifdef TCP_ACK_FILTER
tqe->tcp_PendingAck_index = NOT_TCP_ACK; tqe->index = NOT_TCP_ACK;
if (is_tcp_ack_filter_enabled()) if (is_tcp_ack_filter_enabled())
tcp_process(dev, tqe); tcp_process(dev, tqe);
#endif #endif
...@@ -479,7 +479,7 @@ int wilc_wlan_txq_add_mgmt_pkt(struct net_device *dev, void *priv, u8 *buffer, ...@@ -479,7 +479,7 @@ int wilc_wlan_txq_add_mgmt_pkt(struct net_device *dev, void *priv, u8 *buffer,
tqe->tx_complete_func = func; tqe->tx_complete_func = func;
tqe->priv = priv; tqe->priv = priv;
#ifdef TCP_ACK_FILTER #ifdef TCP_ACK_FILTER
tqe->tcp_PendingAck_index = NOT_TCP_ACK; tqe->index = NOT_TCP_ACK;
#endif #endif
PRINT_D(TX_DBG, "Adding Network packet at the Queue tail\n"); PRINT_D(TX_DBG, "Adding Network packet at the Queue tail\n");
wilc_wlan_txq_add_to_tail(dev, tqe); wilc_wlan_txq_add_to_tail(dev, tqe);
...@@ -911,8 +911,8 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count) ...@@ -911,8 +911,8 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count)
if (tqe->tx_complete_func) if (tqe->tx_complete_func)
tqe->tx_complete_func(tqe->priv, tqe->status); tqe->tx_complete_func(tqe->priv, tqe->status);
#ifdef TCP_ACK_FILTER #ifdef TCP_ACK_FILTER
if (tqe->tcp_PendingAck_index != NOT_TCP_ACK) if (tqe->index != NOT_TCP_ACK)
pending_acks_info[tqe->tcp_PendingAck_index].txqe = NULL; pending_acks_info[tqe->index].txqe = NULL;
#endif #endif
kfree(tqe); kfree(tqe);
} else { } else {
......
...@@ -231,7 +231,7 @@ struct txq_entry_t { ...@@ -231,7 +231,7 @@ struct txq_entry_t {
struct txq_entry_t *next; struct txq_entry_t *next;
struct txq_entry_t *prev; struct txq_entry_t *prev;
int type; int type;
int tcp_PendingAck_index; int index;
u8 *buffer; u8 *buffer;
int buffer_size; int buffer_size;
void *priv; void *priv;
......
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