← Back to branch summary

~ubuntu-branches/ubuntu/trusty/linux-linaro-omap/trusty

« back to all changes in this revision

Viewing changes to drivers/net/pcmcia/smc91c92_cs.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-57i0gl3v99b3lkfg
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/pcmcia/smc91c92_cs.c
1860
1860
    tmp = inw(ioaddr + CONFIG);
1861
1861
    ecmd->port = (tmp & CFG_AUI_SELECT) ? PORT_AUI : PORT_TP;
1862
1862
    ecmd->transceiver = XCVR_INTERNAL;
1863
 
    ecmd->speed = SPEED_10;
 
1863
    ethtool_cmd_speed_set(ecmd, SPEED_10);
1864
1864
    ecmd->phy_address = ioaddr + MGMT;
1865
1865
 
1866
1866
    SMC_SELECT_BANK(0);
1875
1875
    u16 tmp;
1876
1876
    unsigned int ioaddr = dev->base_addr;
1877
1877
 
1878
 
    if (ecmd->speed != SPEED_10)
1879
 
        return -EINVAL;
 
1878
    if (ethtool_cmd_speed(ecmd) != SPEED_10)
 
1879
        return -EINVAL;
1880
1880
    if (ecmd->duplex != DUPLEX_HALF && ecmd->duplex != DUPLEX_FULL)
1881
1881
        return -EINVAL;
1882
1882
    if (ecmd->port != PORT_TP && ecmd->port != PORT_AUI)
2014
2014
        return rc;
2015
2015
}
2016
2016
 
2017
 
static struct pcmcia_device_id smc91c92_ids[] = {
 
2017
static const struct pcmcia_device_id smc91c92_ids[] = {
2018
2018
        PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0109, 0x0501),
2019
2019
        PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0140, 0x000a),
2020
2020
        PCMCIA_PFC_DEVICE_PROD_ID123(0, "MEGAHERTZ", "CC/XJEM3288", "DATA/FAX/CELL ETHERNET MODEM", 0xf510db04, 0x04cd2988, 0x46a52d63),