← Back to branch summary

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

« back to all changes in this revision

Viewing changes to drivers/net/sh_eth.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/sh_eth.c
140
140
        .tpauser        = 1,
141
141
        .hw_swap        = 1,
142
142
        .no_ade         = 1,
 
143
        .rpadir         = 1,
 
144
        .rpadir_value   = 2 << 16,
143
145
};
144
146
 
145
147
#define SH_GIGA_ETH_BASE        0xfee00000
1184
1186
                                mdp->cd->set_rate(ndev);
1185
1187
                }
1186
1188
                if (mdp->link == PHY_DOWN) {
1187
 
                        sh_eth_write(ndev, (sh_eth_read(ndev, ECMR) & ~ECMR_TXF)
1188
 
                                        | ECMR_DM, ECMR);
 
1189
                        sh_eth_write(ndev,
 
1190
                                (sh_eth_read(ndev, ECMR) & ~ECMR_TXF), ECMR);
1189
1191
                        new_state = 1;
1190
1192
                        mdp->link = phydev->link;
1191
1193
                }