aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2010-11-24 01:02:06 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2010-12-11 01:13:46 -0500
commite9262447233037e9336d5866628821156a17366f (patch)
tree737a8ff9edb9aed1f80b8739c30a8369454a06ef /drivers/net
parent36b973df713e1395b79896de667ad7dbb1925fa7 (diff)
e1000e: minor error message corrections
Correct error messages when setting up Rx resources and when checking module parameters. Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/e1000e/netdev.c2
-rw-r--r--drivers/net/e1000e/param.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 4bf843ac7ea..6e1f3a366a7 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -2130,7 +2130,7 @@ err_pages:
2130 } 2130 }
2131err: 2131err:
2132 vfree(rx_ring->buffer_info); 2132 vfree(rx_ring->buffer_info);
2133 e_err("Unable to allocate memory for the transmit descriptor ring\n"); 2133 e_err("Unable to allocate memory for the receive descriptor ring\n");
2134 return err; 2134 return err;
2135} 2135}
2136 2136
diff --git a/drivers/net/e1000e/param.c b/drivers/net/e1000e/param.c
index 3d36911f77f..a9612b0e4bc 100644
--- a/drivers/net/e1000e/param.c
+++ b/drivers/net/e1000e/param.c
@@ -421,7 +421,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
421 static const struct e1000_option opt = { 421 static const struct e1000_option opt = {
422 .type = enable_option, 422 .type = enable_option,
423 .name = "CRC Stripping", 423 .name = "CRC Stripping",
424 .err = "defaulting to enabled", 424 .err = "defaulting to Enabled",
425 .def = OPTION_ENABLED 425 .def = OPTION_ENABLED
426 }; 426 };
427 427