diff --git a/[refs] b/[refs]
index 284b935702ef..5e9bd6c75f8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f38d1008b034e39397d3da67919e220c851db75e
+refs/heads/master: b35b3b49fc6750806964048b31799c8782980ef9
diff --git a/trunk/drivers/net/s2io.c b/trunk/drivers/net/s2io.c
index dcbe01b0ca0d..ab96aa292b78 100644
--- a/trunk/drivers/net/s2io.c
+++ b/trunk/drivers/net/s2io.c
@@ -2458,7 +2458,7 @@ static void free_tx_buffers(struct s2io_nic *nic)
 	for (i = 0; i < config->tx_fifo_num; i++) {
 		unsigned long flags;
 		spin_lock_irqsave(&mac_control->fifos[i].tx_lock, flags);
-		for (j = 0; j < config->tx_cfg[i].fifo_len - 1; j++) {
+		for (j = 0; j < config->tx_cfg[i].fifo_len; j++) {
 			txdp = (struct TxD *) \
 			mac_control->fifos[i].list_info[j].list_virt_addr;
 			skb = s2io_txdl_getskb(&mac_control->fifos[i], txdp, j);