* [PATCH net-next v2] be2net: do external loopback test only when it is requested
@ 2014-03-05 10:54 Ivan Vecera
2014-03-05 21:34 ` Ajit Khaparde
2014-03-06 22:01 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Ivan Vecera @ 2014-03-05 10:54 UTC (permalink / raw)
To: netdev; +Cc: sathya.perla, subbu.seetharaman, ajit.khaparde, sergei.shtylyov
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(-)
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* RE: [PATCH net-next v2] be2net: do external loopback test only when it is requested
2014-03-05 10:54 [PATCH net-next v2] be2net: do external loopback test only when it is requested Ivan Vecera
@ 2014-03-05 21:34 ` Ajit Khaparde
2014-03-06 22:01 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Ajit Khaparde @ 2014-03-05 21:34 UTC (permalink / raw)
To: Ivan Vecera, netdev@vger.kernel.org
Cc: Sathya Perla, Subramanian Seetharaman,
sergei.shtylyov@cogentembedded.com
> -----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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next v2] be2net: do external loopback test only when it is requested
2014-03-05 10:54 [PATCH net-next v2] be2net: do external loopback test only when it is requested Ivan Vecera
2014-03-05 21:34 ` Ajit Khaparde
@ 2014-03-06 22:01 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2014-03-06 22:01 UTC (permalink / raw)
To: ivecera
Cc: netdev, sathya.perla, subbu.seetharaman, ajit.khaparde,
sergei.shtylyov
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-03-06 22:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-05 10:54 [PATCH net-next v2] be2net: do external loopback test only when it is requested Ivan Vecera
2014-03-05 21:34 ` Ajit Khaparde
2014-03-06 22:01 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).