← Back to branch summary

~ubuntu-branches/ubuntu/saucy/linux-ti-omap4/saucy-proposed

« back to all changes in this revision

Viewing changes to drivers/net/ethernet/brocade/bna/bnad_ethtool.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Stefan Bader, Upstream Kernel Changes
  • Date: 2012-08-15 17:17:43 UTC
  • Revision ID: package-import@ubuntu.com-20120815171743-h5wnuf51xe7pvdid
Tags: 3.5.0-207.13
[ Paolo Pisati ]

* Start new release

[ Stefan Bader ]

* (config) Enable getabis to use local package copies

[ Upstream Kernel Changes ]

* fixup: gargabe collect iva_seq[0|1] init
* [Config] enable all SND_OMAP_SOC_*s
* fixup: cm2xxx_3xxx.o is needed for omap2_cm_read|write_reg
* fixup: add some snd_soc_dai* helper functions
* fixup: s/snd_soc_dpcm_params/snd_soc_dpcm/g
* fixup: typo, no_host_mode and useless SDP4430 init
* fixup: enable again aess hwmod

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/ethernet/brocade/bna/bnad_ethtool.c
464
464
                for (i = 0; i < bnad->num_rx; i++) {
465
465
                        if (!bnad->rx_info[i].rx)
466
466
                                continue;
467
 
                        bnad_cleanup_rx(bnad, i);
 
467
                        bnad_destroy_rx(bnad, i);
468
468
                        current_err = bnad_setup_rx(bnad, i);
469
469
                        if (current_err && !err)
470
470
                                err = current_err;
492
492
                for (i = 0; i < bnad->num_tx; i++) {
493
493
                        if (!bnad->tx_info[i].tx)
494
494
                                continue;
495
 
                        bnad_cleanup_tx(bnad, i);
 
495
                        bnad_destroy_tx(bnad, i);
496
496
                        current_err = bnad_setup_tx(bnad, i);
497
497
                        if (current_err && !err)
498
498
                                err = current_err;
539
539
}
540
540
 
541
541
static void
542
 
bnad_get_strings(struct net_device *netdev, u32 stringset, u8 * string)
 
542
bnad_get_strings(struct net_device *netdev, u32 stringset, u8 *string)
543
543
{
544
544
        struct bnad *bnad = netdev_priv(netdev);
545
545
        int i, j, q_num;