diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2008-07-23 09:19:00 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2008-07-23 09:19:00 -0400 |
| commit | 9063974cdbc5463528cb6aa60c91bc0267af7bbb (patch) | |
| tree | 1dffc62d8b79b3d89459cf23aa59c553e186840a /drivers/net/pasemi_mac.c | |
| parent | d6d6a86e14a6b5a26c785b45268874a8f7a52b4d (diff) | |
| parent | c010b2f76c3032e48097a6eef291d8593d5d79a6 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/pasemi_mac.c')
| -rw-r--r-- | drivers/net/pasemi_mac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c index 3b2a6c598088..993d87c9296f 100644 --- a/drivers/net/pasemi_mac.c +++ b/drivers/net/pasemi_mac.c | |||
| @@ -277,7 +277,7 @@ static int get_skb_hdr(struct sk_buff *skb, void **iphdr, | |||
| 277 | *tcph = tcp_hdr(skb); | 277 | *tcph = tcp_hdr(skb); |
| 278 | 278 | ||
| 279 | /* check if ip header and tcp header are complete */ | 279 | /* check if ip header and tcp header are complete */ |
| 280 | if (iph->tot_len < ip_len + tcp_hdrlen(skb)) | 280 | if (ntohs(iph->tot_len) < ip_len + tcp_hdrlen(skb)) |
| 281 | return -1; | 281 | return -1; |
| 282 | 282 | ||
| 283 | *hdr_flags = LRO_IPV4 | LRO_TCP; | 283 | *hdr_flags = LRO_IPV4 | LRO_TCP; |