From e4c6d56841ca3f7a7de010191c928bb0146e97ec Mon Sep 17 00:00:00 2001 From: "shemminger@osdl.org" Date: Mon, 28 Aug 2006 10:00:50 -0700 Subject: [PATCH] --- yaml --- r: 35187 b: refs/heads/master c: 1d179332f8918a5f4e031dc068a469283b01c4c1 h: refs/heads/master i: 35185: 57c5cddf7ec9840a492b08e7ffd0cb6d95d786ce 35183: 81163ee9d3c36a6b2102b87958dfc8de89ca6f5b v: v3 --- [refs] | 2 +- trunk/drivers/net/sky2.c | 17 +++++++++++------ trunk/drivers/net/sky2.h | 2 ++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 338a530429a6..343df6511f62 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e07560cd4f762935968a1120168eb7d22260d85f +refs/heads/master: 1d179332f8918a5f4e031dc068a469283b01c4c1 diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c index fe60f0462c97..eafb6327d68f 100644 --- a/trunk/drivers/net/sky2.c +++ b/trunk/drivers/net/sky2.c @@ -1280,12 +1280,17 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev) if (skb->nh.iph->protocol == IPPROTO_UDP) ctrl |= UDPTCP; - le = get_tx_le(sky2); - le->tx.csum.start = cpu_to_le16(hdr); - le->tx.csum.offset = cpu_to_le16(offset); - le->length = 0; /* initial checksum value */ - le->ctrl = 1; /* one packet */ - le->opcode = OP_TCPLISW | HW_OWNER; + if (hdr != sky2->tx_csum_start || offset != sky2->tx_csum_offset) { + sky2->tx_csum_start = hdr; + sky2->tx_csum_offset = offset; + + le = get_tx_le(sky2); + le->tx.csum.start = cpu_to_le16(hdr); + le->tx.csum.offset = cpu_to_le16(offset); + le->length = 0; /* initial checksum value */ + le->ctrl = 1; /* one packet */ + le->opcode = OP_TCPLISW | HW_OWNER; + } } le = get_tx_le(sky2); diff --git a/trunk/drivers/net/sky2.h b/trunk/drivers/net/sky2.h index bb92f694247f..fa8af9f503e4 100644 --- a/trunk/drivers/net/sky2.h +++ b/trunk/drivers/net/sky2.h @@ -1843,6 +1843,8 @@ struct sky2_port { u32 tx_addr64; u16 tx_pending; u16 tx_last_mss; + u16 tx_csum_start; + u16 tx_csum_offset; struct ring_info *rx_ring ____cacheline_aligned_in_smp; struct sky2_rx_le *rx_le;