[<prev] [next>] [day] [month] [year] [list]
Message-ID: <df81548691714f2fb6b02f14b8e58ed4@rwthex-w2-b.rwth-ad.de>
Date: Mon, 6 Feb 2017 21:20:34 +0100
From: Stefan Brüns <stefan.bruens@...h-aachen.de>
To: <linux-usb@...r.kernel.org>
CC: <netdev@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
Stefan Brüns <stefan.bruens@...h-aachen.de>
Subject: [PATCH 2/2] sierra_net: Skip validating irrelevant fields for IDLE LSIs
When the context is deactivated, the link_type is set to 0xff, which
triggers a warning message, and results in a wrong link status, as
the LSI is ignored.
Signed-off-by: Stefan Brüns <stefan.bruens@...h-aachen.de>
---
drivers/net/usb/sierra_net.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
index 8c2a16c28ec1..567c7a0bb30e 100644
--- a/drivers/net/usb/sierra_net.c
+++ b/drivers/net/usb/sierra_net.c
@@ -387,6 +387,13 @@ static int sierra_net_parse_lsi(struct usbnet *dev, char *data, int datalen)
return -1;
}
+ /* Validate the session state */
+ if (lsi->session_state == SIERRA_NET_SESSION_IDLE) {
+ netdev_err(dev->net, "Session idle, 0x%02x\n",
+ lsi->session_state);
+ return 0;
+ }
+
/* Validate the protocol - only support UMTS for now */
if (lsi->protocol == SIERRA_NET_PROTOCOL_UMTS) {
struct lsi_umts_single *single = (struct lsi_umts_single *)lsi;
@@ -420,13 +427,6 @@ static int sierra_net_parse_lsi(struct usbnet *dev, char *data, int datalen)
return 0;
}
- /* Validate the session state */
- if (lsi->session_state == SIERRA_NET_SESSION_IDLE) {
- netdev_err(dev->net, "Session idle, 0x%02x\n",
- lsi->session_state);
- return 0;
- }
-
/* Set link_sense true */
return 1;
}
--
2.11.0
Powered by blists - more mailing lists