Commit b719302d authored by Glen Lee's avatar Glen Lee Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: rename index to tcp_pending_ack_idx 



This patch renames "index" of struct txq_entry_t to tcp_pending_ack_idx
since this name could be confused index of txq_entry_t. It is index of
tcp pending ack.

It fixes 8e55639d ("staging: wilc1000: rename tcp_PendingAck_index
of struct txq_entry_t")

Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a5038d56

drivers/staging/wilc1000/wilc_wlan.c

+6 −6
Original line number Diff line number Diff line
@@ -249,7 +249,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].txqe = txqe;

		pending_acks_info[pending_base + pending_acks].session_index = session_index;

		txqe->index = pending_base + pending_acks;

		txqe->tcp_pending_ack_idx = pending_base + pending_acks;

		pending_acks++;

	}

	return 0;
@@ -421,7 +421,7 @@ static int wilc_wlan_txq_add_cfg_pkt(struct wilc *wilc, u8 *buffer, u32 buffer_s 
	tqe->tx_complete_func = NULL;

	tqe->priv = NULL;

#ifdef TCP_ACK_FILTER

	tqe->index = NOT_TCP_ACK;

	tqe->tcp_pending_ack_idx = NOT_TCP_ACK;

#endif

	PRINT_D(TX_DBG, "Adding the config packet at the Queue tail\n");
@@ -451,7 +451,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");

#ifdef TCP_ACK_FILTER

	tqe->index = NOT_TCP_ACK;

	tqe->tcp_pending_ack_idx = NOT_TCP_ACK;

	if (is_tcp_ack_filter_enabled())

		tcp_process(dev, tqe);

#endif
@@ -478,7 +478,7 @@ int wilc_wlan_txq_add_mgmt_pkt(struct net_device *dev, void *priv, u8 *buffer, 
	tqe->tx_complete_func = func;

	tqe->priv = priv;

#ifdef TCP_ACK_FILTER

	tqe->index = NOT_TCP_ACK;

	tqe->tcp_pending_ack_idx = NOT_TCP_ACK;

#endif

	PRINT_D(TX_DBG, "Adding Network packet at the Queue tail\n");

	wilc_wlan_txq_add_to_tail(dev, tqe);
@@ -923,8 +923,8 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count) 
					tqe->tx_complete_func(tqe->priv,

							      tqe->status);

				#ifdef TCP_ACK_FILTER

				if (tqe->index != NOT_TCP_ACK)

					pending_acks_info[tqe->index].txqe = NULL;

				if (tqe->tcp_pending_ack_idx != NOT_TCP_ACK)

					pending_acks_info[tqe->tcp_pending_ack_idx].txqe = NULL;

				#endif

				kfree(tqe);

			} else {

drivers/staging/wilc1000/wilc_wlan.h

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ struct txq_entry_t { 
	struct txq_entry_t *next;

	struct txq_entry_t *prev;

	int type;

	int index;

	int tcp_pending_ack_idx;

	u8 *buffer;

	int buffer_size;

	void *priv;

CRA Git | Maintained and supported by SUSTech CRA and CCSE