← 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/intel/e1000e/param.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/intel/e1000e/param.c
166
166
 *
167
167
 * Default Value: 1 (enabled)
168
168
 */
169
 
E1000_PARAM(CrcStripping, "Enable CRC Stripping, disable if your BMC needs " \
170
 
                          "the CRC");
 
169
E1000_PARAM(CrcStripping,
 
170
            "Enable CRC Stripping, disable if your BMC needs the CRC");
171
171
 
172
172
struct e1000_option {
173
173
        enum { enable_option, range_option, list_option } type;
347
347
 
348
348
                        /*
349
349
                         * Make sure a message is printed for non-special
350
 
                         * values.  And in case of an invalid option, display
351
 
                         * warning, use default and got through itr/itr_setting
 
350
                         * values. And in case of an invalid option, display
 
351
                         * warning, use default and go through itr/itr_setting
352
352
                         * adjustment logic below
353
353
                         */
354
354
                        if ((adapter->itr > 4) &&
365
365
                         * Make sure a message is printed for non-special
366
366
                         * default values
367
367
                         */
368
 
                        if (adapter->itr > 40)
 
368
                        if (adapter->itr > 4)
369
369
                                e_info("%s set to default %d\n", opt.name,
370
370
                                       adapter->itr);
371
371
                }