diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-07-02 08:15:33 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-07-02 08:15:33 -0400 |
| commit | c529e632a286cd9e493398fa73e0aa1fc5a45ce5 (patch) | |
| tree | bf7c1c14e3fd582245066c6c8840adaba58ba3df /drivers/net | |
| parent | 36f9d0c5e9dc650de26b112079f46e6160a881a0 (diff) | |
| parent | 8da32de5c845b711a500f89342baf10c662e2ecb (diff) | |
Merge branch 'for_linus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream-fixes
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/gianfar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 6822bf14267b..1b854bf07b09 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
| @@ -944,7 +944,7 @@ static inline void gfar_tx_checksum(struct sk_buff *skb, struct txfcb *fcb) | |||
| 944 | flags |= TXFCB_UDP; | 944 | flags |= TXFCB_UDP; |
| 945 | fcb->phcs = udp_hdr(skb)->check; | 945 | fcb->phcs = udp_hdr(skb)->check; |
| 946 | } else | 946 | } else |
| 947 | fcb->phcs = udp_hdr(skb)->check; | 947 | fcb->phcs = tcp_hdr(skb)->check; |
| 948 | 948 | ||
| 949 | /* l3os is the distance between the start of the | 949 | /* l3os is the distance between the start of the |
| 950 | * frame (skb->data) and the start of the IP hdr. | 950 | * frame (skb->data) and the start of the IP hdr. |