diff options
| author | Patrick McHardy <kaber@trash.net> | 2010-05-10 12:39:28 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-05-10 12:39:28 -0400 |
| commit | 1e4b1057121bc756b91758a434b504d2010f6088 (patch) | |
| tree | b016cf2c728289c7e36d9e4e488f30ab0bd0ae6e /drivers/net/bcm63xx_enet.c | |
| parent | 3b254c54ec46eb022cb26ee6ab37fae23f5f7d6a (diff) | |
| parent | 3ee943728fff536edaf8f59faa58aaa1aa7366e3 (diff) | |
Merge branch 'master' of /repos/git/net-next-2.6
Conflicts:
net/bridge/br_device.c
net/bridge/br_forward.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'drivers/net/bcm63xx_enet.c')
| -rw-r--r-- | drivers/net/bcm63xx_enet.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/bcm63xx_enet.c index 9a8bdea4a8ec..f48ba80025a2 100644 --- a/drivers/net/bcm63xx_enet.c +++ b/drivers/net/bcm63xx_enet.c | |||
| @@ -1647,7 +1647,6 @@ static int __devinit bcm_enet_probe(struct platform_device *pdev) | |||
| 1647 | if (!dev) | 1647 | if (!dev) |
| 1648 | return -ENOMEM; | 1648 | return -ENOMEM; |
| 1649 | priv = netdev_priv(dev); | 1649 | priv = netdev_priv(dev); |
| 1650 | memset(priv, 0, sizeof(*priv)); | ||
| 1651 | 1650 | ||
| 1652 | ret = compute_hw_mtu(priv, dev->mtu); | 1651 | ret = compute_hw_mtu(priv, dev->mtu); |
| 1653 | if (ret) | 1652 | if (ret) |