Re: [PATCH 2/2] sky2: fix transmit state on resume

[Jeff Garzik]

Stephen Hemminger wrote:

Patch is against 2.6.23-rc8 after last patch:
 sky2: FE+ vlan workaround

(Should also work on older releases with minor fuzz).


Applied.  Please always put meta-information such as the above quoted 
after the "---" patch description terminator, so that it is not copied 
into the permanent kernel changelog.  This text must be hand-edited out 
of each patch, before application.


See item #14 of Documentation/SubmittingPatches.


-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 2/2] sky2: fix transmit state on resume

[Stephen Hemminger]

This should fix http://bugzilla.kernel.org/show_bug.cgi?id=8667

After resume, driver has reset the chip so the current state
of transmit checksum offload state machine and DMA state machine
will be undefined.

The fix is to set the state so that first Tx will set MSS and offset
values.

Patch is against 2.6.23-rc8 after last patch:
 sky2: FE+ vlan workaround

(Should also work on older releases with minor fuzz).

Signed-off-by: Stephen Hemminger <[EMAIL PROTECTED]>

--- a/drivers/net/sky2.c2007-09-27 08:45:13.0 -0700
+++ b/drivers/net/sky2.c2007-09-27 09:39:49.0 -0700
@@ -910,6 +910,20 @@ static inline struct sky2_tx_le *get_tx_
return le;
 }
 
+static void tx_init(struct sky2_port *sky2)
+{
+   struct sky2_tx_le *le;
+
+   sky2->tx_prod = sky2->tx_cons = 0;
+   sky2->tx_tcpsum = 0;
+   sky2->tx_last_mss = 0;
+
+   le = get_tx_le(sky2);
+   le->addr = 0;
+   le->opcode = OP_ADDR64 | HW_OWNER;
+   sky2->tx_addr64 = 0;
+}
+
 static inline struct tx_ring_info *tx_le_re(struct sky2_port *sky2,
struct sky2_tx_le *le)
 {
@@ -1320,7 +1334,8 @@ static int sky2_up(struct net_device *de
GFP_KERNEL);
if (!sky2->tx_ring)
goto err_out;
-   sky2->tx_prod = sky2->tx_cons = 0;
+
+   tx_init(sky2);
 
sky2->rx_le = pci_alloc_consistent(hw->pdev, RX_LE_BYTES,
   &sky2->rx_le_map);
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html