Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 35187
b: refs/heads/master
c: 1d17933
h: refs/heads/master
i:
  35185: 57c5cdd
  35183: 81163ee
v: v3
  • Loading branch information
shemminger@osdl.org authored and Jeff Garzik committed Aug 29, 2006
1 parent 70e3b60 commit e4c6d56
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e07560cd4f762935968a1120168eb7d22260d85f
refs/heads/master: 1d179332f8918a5f4e031dc068a469283b01c4c1
17 changes: 11 additions & 6 deletions trunk/drivers/net/sky2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions trunk/drivers/net/sky2.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit e4c6d56

Please sign in to comment.