diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-09 18:50:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-09 18:50:41 -0400 |
| commit | 09075ef0fd585fb093bb9a6cd1240272114f89cf (patch) | |
| tree | c01d2cc260a18df73f785bea4de1c1cfbcbbd16f /drivers/net/sky2.c | |
| parent | c87fed1546bd00b42ee75f26c6b45393e4bf7559 (diff) | |
| parent | 1b30dd359ebec22d035e8b145751319f63772ca1 (diff) | |
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 of HEAD
* HEAD:
[AX.25]: Use kzalloc
[ATM] net/atm/clip.c: fix PROC_FS=n compile
[PKT_SCHED]: act_api: Fix module leak while flushing actions
[NET]: Fix IPv4/DECnet routing rule dumping
[NET] gso: Fix up GSO packets with broken checksums
[NET] gso: Add skb_is_gso
[IRDA]: fix drivers/net/irda/ali-ircc.c:ali_ircc_init()
[ATM]: fix possible recursive locking in skb_migrate()
[ATM]: Typo in drivers/atm/Kconfig...
[TG3]: add amd8131 to "write reorder" chipsets
[NET]: Fix network device interface printk message priority
Diffstat (limited to 'drivers/net/sky2.c')
| -rw-r--r-- | drivers/net/sky2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 418f169a6a31..31093760aa1e 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
| @@ -1159,7 +1159,7 @@ static unsigned tx_le_req(const struct sk_buff *skb) | |||
| 1159 | count = sizeof(dma_addr_t) / sizeof(u32); | 1159 | count = sizeof(dma_addr_t) / sizeof(u32); |
| 1160 | count += skb_shinfo(skb)->nr_frags * count; | 1160 | count += skb_shinfo(skb)->nr_frags * count; |
| 1161 | 1161 | ||
| 1162 | if (skb_shinfo(skb)->gso_size) | 1162 | if (skb_is_gso(skb)) |
| 1163 | ++count; | 1163 | ++count; |
| 1164 | 1164 | ||
| 1165 | if (skb->ip_summed == CHECKSUM_HW) | 1165 | if (skb->ip_summed == CHECKSUM_HW) |