diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-03 18:43:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-03 18:43:36 -0400 |
| commit | 3e0ca2f148f97c5748f52bcf2a69dd17cb2b1d13 (patch) | |
| tree | 10782f75b5b09e9bb738534410af106efb0cf926 /drivers/net/sky2.c | |
| parent | c7659e2c139d0be4647bef89188a932e0254d709 (diff) | |
| parent | 529d303e075aa6d988f30935b8995ffb382ad38e (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
sky2: jumbo frame regression fix
[PATCH] softmac: Fix compiler-warning
[PATCH] bcm43xx: Correct printk with PFX before KERN_
Diffstat (limited to 'drivers/net/sky2.c')
| -rw-r--r-- | drivers/net/sky2.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 162489b9f599..ea117fc3d5e3 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
| @@ -2163,9 +2163,6 @@ static struct sk_buff *sky2_receive(struct net_device *dev, | |||
| 2163 | sky2->rx_next = (sky2->rx_next + 1) % sky2->rx_pending; | 2163 | sky2->rx_next = (sky2->rx_next + 1) % sky2->rx_pending; |
| 2164 | prefetch(sky2->rx_ring + sky2->rx_next); | 2164 | prefetch(sky2->rx_ring + sky2->rx_next); |
| 2165 | 2165 | ||
| 2166 | if (length < ETH_ZLEN || length > sky2->rx_data_size) | ||
| 2167 | goto len_error; | ||
| 2168 | |||
| 2169 | /* This chip has hardware problems that generates bogus status. | 2166 | /* This chip has hardware problems that generates bogus status. |
| 2170 | * So do only marginal checking and expect higher level protocols | 2167 | * So do only marginal checking and expect higher level protocols |
| 2171 | * to handle crap frames. | 2168 | * to handle crap frames. |