| Message ID | 1394016845-5376-1-git-send-email-ivecera@redhat.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
> -----Original Message----- > From: Ivan Vecera [mailto:ivecera@redhat.com] > Sent: Wednesday, March 05, 2014 4:54 AM > To: netdev@vger.kernel.org > Cc: Sathya Perla; Subramanian Seetharaman; Ajit Khaparde; > sergei.shtylyov@cogentembedded.com > Subject: [PATCH net-next v2] be2net: do external loopback test only when it > is requested > > v2: remove unnecessary braces from all 'loopback' if-blocks (thx Sergei) > > Cc: sathya.perla@emulex.com > Cc: subbu.seetharaman@emulex.com > Cc: ajit.khaparde@emulex.com > Cc: sergei.shtylyov@cogentembedded.com > > Signed-off-by: Ivan Vecera <ivecera@redhat.com> Acked-by: Ajit Khaparde <ajit.khaparde@emulex.com> > --- > drivers/net/ethernet/emulex/benet/be_ethtool.c | 16 +++++++++------- > 1 file changed, 9 insertions(+), 7 deletions(-) > > diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c > b/drivers/net/ethernet/emulex/benet/be_ethtool.c > index cf09d8f..66759b6 100644 > --- a/drivers/net/ethernet/emulex/benet/be_ethtool.c > +++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c > @@ -802,16 +802,18 @@ be_self_test(struct net_device *netdev, struct > ethtool_test *test, u64 *data) > > if (test->flags & ETH_TEST_FL_OFFLINE) { > if (be_loopback_test(adapter, BE_MAC_LOOPBACK, > - &data[0]) != 0) { > + &data[0]) != 0) > test->flags |= ETH_TEST_FL_FAILED; > - } > + > if (be_loopback_test(adapter, BE_PHY_LOOPBACK, > - &data[1]) != 0) { > - test->flags |= ETH_TEST_FL_FAILED; > - } > - if (be_loopback_test(adapter, > BE_ONE_PORT_EXT_LOOPBACK, > - &data[2]) != 0) { > + &data[1]) != 0) > test->flags |= ETH_TEST_FL_FAILED; > + > + if (test->flags & ETH_TEST_FL_EXTERNAL_LB) { > + if (be_loopback_test(adapter, > BE_ONE_PORT_EXT_LOOPBACK, > + &data[2]) != 0) > + test->flags |= ETH_TEST_FL_FAILED; > + test->flags |= ETH_TEST_FL_EXTERNAL_LB_DONE; > } > } > > -- > 1.8.3.2 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Ivan Vecera <ivecera@redhat.com> Date: Wed, 5 Mar 2014 11:54:05 +0100 > v2: remove unnecessary braces from all 'loopback' if-blocks (thx Sergei) > > Cc: sathya.perla@emulex.com > Cc: subbu.seetharaman@emulex.com > Cc: ajit.khaparde@emulex.com > Cc: sergei.shtylyov@cogentembedded.com > > Signed-off-by: Ivan Vecera <ivecera@redhat.com> Applied, thank you. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c index cf09d8f..66759b6 100644 --- a/drivers/net/ethernet/emulex/benet/be_ethtool.c +++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c @@ -802,16 +802,18 @@ be_self_test(struct net_device *netdev, struct ethtool_test *test, u64 *data) if (test->flags & ETH_TEST_FL_OFFLINE) { if (be_loopback_test(adapter, BE_MAC_LOOPBACK, - &data[0]) != 0) { + &data[0]) != 0) test->flags |= ETH_TEST_FL_FAILED; - } + if (be_loopback_test(adapter, BE_PHY_LOOPBACK, - &data[1]) != 0) { - test->flags |= ETH_TEST_FL_FAILED; - } - if (be_loopback_test(adapter, BE_ONE_PORT_EXT_LOOPBACK, - &data[2]) != 0) { + &data[1]) != 0) test->flags |= ETH_TEST_FL_FAILED; + + if (test->flags & ETH_TEST_FL_EXTERNAL_LB) { + if (be_loopback_test(adapter, BE_ONE_PORT_EXT_LOOPBACK, + &data[2]) != 0) + test->flags |= ETH_TEST_FL_FAILED; + test->flags |= ETH_TEST_FL_EXTERNAL_LB_DONE; } }
v2: remove unnecessary braces from all 'loopback' if-blocks (thx Sergei) Cc: sathya.perla@emulex.com Cc: subbu.seetharaman@emulex.com Cc: ajit.khaparde@emulex.com Cc: sergei.shtylyov@cogentembedded.com Signed-off-by: Ivan Vecera <ivecera@redhat.com> --- drivers/net/ethernet/emulex/benet/be_ethtool.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)