← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-linaro-mx51/quantal

« back to all changes in this revision

Viewing changes to drivers/net/bcm63xx_enet.c

  • Committer: Package Import Robot
  • Author(s): John Rigby, John Rigby
  • Date: 2011-09-26 10:44:23 UTC
  • Revision ID: package-import@ubuntu.com-20110926104423-3o58a3c1bj7x00rs
Tags: 3.0.0-1007.9
https://launchpad.net/bugs/826021
[ John Rigby ]

Enable crypto modules and remove crypto-modules from
exclude-module files
LP: #826021

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/bcm63xx_enet.c
839
839
        if (ret)
840
840
                goto out_phy_disconnect;
841
841
 
842
 
        ret = request_irq(priv->irq_rx, bcm_enet_isr_dma,
843
 
                          IRQF_SAMPLE_RANDOM | IRQF_DISABLED, dev->name, dev);
 
842
        ret = request_irq(priv->irq_rx, bcm_enet_isr_dma, IRQF_DISABLED,
 
843
                          dev->name, dev);
844
844
        if (ret)
845
845
                goto out_freeirq;
846
846
 
1346
1346
                return phy_ethtool_gset(priv->phydev, cmd);
1347
1347
        } else {
1348
1348
                cmd->autoneg = 0;
1349
 
                cmd->speed = (priv->force_speed_100) ? SPEED_100 : SPEED_10;
 
1349
                ethtool_cmd_speed_set(cmd, ((priv->force_speed_100)
 
1350
                                            ? SPEED_100 : SPEED_10));
1350
1351
                cmd->duplex = (priv->force_duplex_full) ?
1351
1352
                        DUPLEX_FULL : DUPLEX_HALF;
1352
1353
                cmd->supported = ADVERTISED_10baseT_Half  |