← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/net/ns83820.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/ns83820.c
512
512
/* Packet Receiver
513
513
 *
514
514
 * The hardware supports linked lists of receive descriptors for
515
 
 * which ownership is transfered back and forth by means of an
 
515
 * which ownership is transferred back and forth by means of an
516
516
 * ownership bit.  While the hardware does support the use of a
517
517
 * ring for receive descriptors, we only make use of a chain in
518
518
 * an attempt to reduce bus traffic under heavy load scenarios.
1147
1147
#ifdef NS83820_VLAN_ACCEL_SUPPORT
1148
1148
        if(vlan_tx_tag_present(skb)) {
1149
1149
                /* fetch the vlan tag info out of the
1150
 
                 * ancilliary data if the vlan code
 
1150
                 * ancillary data if the vlan code
1151
1151
                 * is using hw vlan acceleration
1152
1152
                 */
1153
1153
                short tag = vlan_tx_tag_get(skb);
1251
1251
        /*
1252
1252
         * Here's the list of available ethtool commands from other drivers:
1253
1253
         *      cmd->advertising =
1254
 
         *      cmd->speed =
 
1254
         *      ethtool_cmd_speed_set(cmd, ...)
1255
1255
         *      cmd->duplex =
1256
1256
         *      cmd->port = 0;
1257
1257
         *      cmd->phy_address =
1289
1289
        cmd->duplex = fullduplex ? DUPLEX_FULL : DUPLEX_HALF;
1290
1290
        switch (cfg / CFG_SPDSTS0 & 3) {
1291
1291
        case 2:
1292
 
                cmd->speed = SPEED_1000;
 
1292
                ethtool_cmd_speed_set(cmd, SPEED_1000);
1293
1293
                break;
1294
1294
        case 1:
1295
 
                cmd->speed = SPEED_100;
 
1295
                ethtool_cmd_speed_set(cmd, SPEED_100);
1296
1296
                break;
1297
1297
        default:
1298
 
                cmd->speed = SPEED_10;
 
1298
                ethtool_cmd_speed_set(cmd, SPEED_10);
1299
1299
                break;
1300
1300
        }
1301
1301
        cmd->autoneg = (tbicr & TBICR_MR_AN_ENABLE)