diff options
| author | Bruce Allan <bruce.w.allan@intel.com> | 2010-11-24 07:02:06 +0100 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2010-12-11 07:13:46 +0100 |
| commit | e9262447233037e9336d5866628821156a17366f (patch) | |
| tree | 737a8ff9edb9aed1f80b8739c30a8369454a06ef | |
| parent | e1000e: prevent null ptr dereference in e1000_tx_queue() (diff) | |
| download | linux-e9262447233037e9336d5866628821156a17366f.tar.xz linux-e9262447233037e9336d5866628821156a17366f.zip | |
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>
| -rw-r--r-- | drivers/net/e1000e/netdev.c | 2 | ||||
| -rw-r--r-- | drivers/net/e1000e/param.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 4bf843ac7ea3..6e1f3a366a7a 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -2130,7 +2130,7 @@ err_pages: } err: vfree(rx_ring->buffer_info); - e_err("Unable to allocate memory for the transmit descriptor ring\n"); + e_err("Unable to allocate memory for the receive descriptor ring\n"); return err; } diff --git a/drivers/net/e1000e/param.c b/drivers/net/e1000e/param.c index 3d36911f77f3..a9612b0e4bca 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) static const struct e1000_option opt = { .type = enable_option, .name = "CRC Stripping", - .err = "defaulting to enabled", + .err = "defaulting to Enabled", .def = OPTION_ENABLED }; |