diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-04-27 14:16:19 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-04-27 14:16:19 -0400 |
| commit | d1da4e50e5d09f02c340927a4fcb7f54202fa033 (patch) | |
| tree | 7f98317bdd45dbdb7644e9179891c5af6a3a8ef1 /drivers/net/3c527.c | |
| parent | 78ab67da1002d954ea4c3e2b441e2483c41f94e8 (diff) | |
| parent | a205752d1ad2d37d6597aaae5a56fc396a770868 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/mtd/Kconfig
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'drivers/net/3c527.c')
| -rw-r--r-- | drivers/net/3c527.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c index 6c7437e60bd2..c7b571be20e0 100644 --- a/drivers/net/3c527.c +++ b/drivers/net/3c527.c | |||
| @@ -1189,7 +1189,6 @@ static void mc32_rx_ring(struct net_device *dev) | |||
| 1189 | } | 1189 | } |
| 1190 | 1190 | ||
| 1191 | skb->protocol=eth_type_trans(skb,dev); | 1191 | skb->protocol=eth_type_trans(skb,dev); |
| 1192 | skb->dev=dev; | ||
| 1193 | dev->last_rx = jiffies; | 1192 | dev->last_rx = jiffies; |
| 1194 | lp->net_stats.rx_packets++; | 1193 | lp->net_stats.rx_packets++; |
| 1195 | lp->net_stats.rx_bytes += length; | 1194 | lp->net_stats.rx_bytes += length; |