aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuresh Reddy <suresh.reddy@emulex.com>2013-04-25 19:03:21 -0400
committerDavid S. Miller <davem@davemloft.net>2013-04-26 23:24:11 -0400
commit18fb06a1cdbc44dbbccbbb6f96e6e8f2da153cde (patch)
treed2afef34b79c470f00db956b8568095feb211509
parent594ad54a2c3b215f6fc8873518d59d802f88c10b (diff)
be2net: Renamed rx_address_mismatch_errors to rx_address_filtered
Signed-off-by: Suresh Reddy <suresh.reddy@emulex.com> Signed-off-by: Sarveshwar Bandi <sarveshwar.bandi@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/emulex/benet/be.h2
-rw-r--r--drivers/net/ethernet/emulex/benet/be_cmds.h10
-rw-r--r--drivers/net/ethernet/emulex/benet/be_ethtool.c2
-rw-r--r--drivers/net/ethernet/emulex/benet/be_main.c14
4 files changed, 14 insertions, 14 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index 4b62e7f1143c..9045903dcda3 100644
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -293,7 +293,7 @@ struct be_drv_stats {
293 u32 rx_in_range_errors; 293 u32 rx_in_range_errors;
294 u32 rx_out_range_errors; 294 u32 rx_out_range_errors;
295 u32 rx_frame_too_long; 295 u32 rx_frame_too_long;
296 u32 rx_address_mismatch_drops; 296 u32 rx_address_filtered;
297 u32 rx_dropped_too_small; 297 u32 rx_dropped_too_small;
298 u32 rx_dropped_too_short; 298 u32 rx_dropped_too_short;
299 u32 rx_dropped_header_too_small; 299 u32 rx_dropped_header_too_small;
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.h b/drivers/net/ethernet/emulex/benet/be_cmds.h
index 4d03789119ab..0fc9b4775699 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.h
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.h
@@ -590,8 +590,8 @@ struct be_port_rxf_stats_v0 {
590 u32 rx_in_range_errors; /* dword 10*/ 590 u32 rx_in_range_errors; /* dword 10*/
591 u32 rx_out_range_errors; /* dword 11*/ 591 u32 rx_out_range_errors; /* dword 11*/
592 u32 rx_frame_too_long; /* dword 12*/ 592 u32 rx_frame_too_long; /* dword 12*/
593 u32 rx_address_mismatch_drops; /* dword 13*/ 593 u32 rx_address_filtered; /* dword 13*/
594 u32 rx_vlan_mismatch_drops; /* dword 14*/ 594 u32 rx_vlan_filtered; /* dword 14*/
595 u32 rx_dropped_too_small; /* dword 15*/ 595 u32 rx_dropped_too_small; /* dword 15*/
596 u32 rx_dropped_too_short; /* dword 16*/ 596 u32 rx_dropped_too_short; /* dword 16*/
597 u32 rx_dropped_header_too_small; /* dword 17*/ 597 u32 rx_dropped_header_too_small; /* dword 17*/
@@ -797,8 +797,8 @@ struct lancer_pport_stats {
797 u32 rx_control_frames_unknown_opcode_hi; 797 u32 rx_control_frames_unknown_opcode_hi;
798 u32 rx_in_range_errors; 798 u32 rx_in_range_errors;
799 u32 rx_out_of_range_errors; 799 u32 rx_out_of_range_errors;
800 u32 rx_address_mismatch_drops; 800 u32 rx_address_filtered;
801 u32 rx_vlan_mismatch_drops; 801 u32 rx_vlan_filtered;
802 u32 rx_dropped_too_small; 802 u32 rx_dropped_too_small;
803 u32 rx_dropped_too_short; 803 u32 rx_dropped_too_short;
804 u32 rx_dropped_header_too_small; 804 u32 rx_dropped_header_too_small;
@@ -1576,7 +1576,7 @@ struct be_port_rxf_stats_v1 {
1576 u32 rx_in_range_errors; 1576 u32 rx_in_range_errors;
1577 u32 rx_out_range_errors; 1577 u32 rx_out_range_errors;
1578 u32 rx_frame_too_long; 1578 u32 rx_frame_too_long;
1579 u32 rx_address_mismatch_drops; 1579 u32 rx_address_filtered;
1580 u32 rx_dropped_too_small; 1580 u32 rx_dropped_too_small;
1581 u32 rx_dropped_too_short; 1581 u32 rx_dropped_too_short;
1582 u32 rx_dropped_header_too_small; 1582 u32 rx_dropped_header_too_small;
diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
index ac05bbeef9f4..c4662db825b0 100644
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
@@ -54,7 +54,7 @@ static const struct be_ethtool_stat et_stats[] = {
54 /* Received packets dropped when they don't pass the unicast or 54 /* Received packets dropped when they don't pass the unicast or
55 * multicast address filtering. 55 * multicast address filtering.
56 */ 56 */
57 {DRVSTAT_INFO(rx_address_mismatch_drops)}, 57 {DRVSTAT_INFO(rx_address_filtered)},
58 /* Received packets dropped when IP packet length field is less than 58 /* Received packets dropped when IP packet length field is less than
59 * the IP header length field. 59 * the IP header length field.
60 */ 60 */
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index a8926eb48b6d..43d5c1e29fc7 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -353,9 +353,9 @@ static void populate_be_v0_stats(struct be_adapter *adapter)
353 drvs->rx_input_fifo_overflow_drop = port_stats->rx_input_fifo_overflow; 353 drvs->rx_input_fifo_overflow_drop = port_stats->rx_input_fifo_overflow;
354 drvs->rx_dropped_header_too_small = 354 drvs->rx_dropped_header_too_small =
355 port_stats->rx_dropped_header_too_small; 355 port_stats->rx_dropped_header_too_small;
356 drvs->rx_address_mismatch_drops = 356 drvs->rx_address_filtered =
357 port_stats->rx_address_mismatch_drops + 357 port_stats->rx_address_filtered +
358 port_stats->rx_vlan_mismatch_drops; 358 port_stats->rx_vlan_filtered;
359 drvs->rx_alignment_symbol_errors = 359 drvs->rx_alignment_symbol_errors =
360 port_stats->rx_alignment_symbol_errors; 360 port_stats->rx_alignment_symbol_errors;
361 361
@@ -404,7 +404,7 @@ static void populate_be_v1_stats(struct be_adapter *adapter)
404 port_stats->rx_dropped_header_too_small; 404 port_stats->rx_dropped_header_too_small;
405 drvs->rx_input_fifo_overflow_drop = 405 drvs->rx_input_fifo_overflow_drop =
406 port_stats->rx_input_fifo_overflow_drop; 406 port_stats->rx_input_fifo_overflow_drop;
407 drvs->rx_address_mismatch_drops = port_stats->rx_address_mismatch_drops; 407 drvs->rx_address_filtered = port_stats->rx_address_filtered;
408 drvs->rx_alignment_symbol_errors = 408 drvs->rx_alignment_symbol_errors =
409 port_stats->rx_alignment_symbol_errors; 409 port_stats->rx_alignment_symbol_errors;
410 drvs->rxpp_fifo_overflow_drop = port_stats->rxpp_fifo_overflow_drop; 410 drvs->rxpp_fifo_overflow_drop = port_stats->rxpp_fifo_overflow_drop;
@@ -445,9 +445,9 @@ static void populate_lancer_stats(struct be_adapter *adapter)
445 drvs->rx_dropped_header_too_small = 445 drvs->rx_dropped_header_too_small =
446 pport_stats->rx_dropped_header_too_small; 446 pport_stats->rx_dropped_header_too_small;
447 drvs->rx_input_fifo_overflow_drop = pport_stats->rx_fifo_overflow; 447 drvs->rx_input_fifo_overflow_drop = pport_stats->rx_fifo_overflow;
448 drvs->rx_address_mismatch_drops = 448 drvs->rx_address_filtered =
449 pport_stats->rx_address_mismatch_drops + 449 pport_stats->rx_address_filtered +
450 pport_stats->rx_vlan_mismatch_drops; 450 pport_stats->rx_vlan_filtered;
451 drvs->rx_alignment_symbol_errors = pport_stats->rx_symbol_errors_lo; 451 drvs->rx_alignment_symbol_errors = pport_stats->rx_symbol_errors_lo;
452 drvs->rxpp_fifo_overflow_drop = pport_stats->rx_fifo_overflow; 452 drvs->rxpp_fifo_overflow_drop = pport_stats->rx_fifo_overflow;
453 drvs->tx_pauseframes = pport_stats->tx_pause_frames_lo; 453 drvs->tx_pauseframes = pport_stats->tx_pause_frames_lo;