diff options
| author | Stefan Brüns <stefan.bruens@rwth-aachen.de> | 2017-02-08 02:46:33 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-09 16:41:43 -0500 |
| commit | 764895d3039e903dac3a70f219949efe43d036a0 (patch) | |
| tree | 63455badce6b917d1510cff4a4e0ef1dcb897037 | |
| parent | 5a70348e1187c5bf1cbd0ec51843f36befed1c2d (diff) | |
| download | linux-764895d3039e903dac3a70f219949efe43d036a0.tar.gz linux-764895d3039e903dac3a70f219949efe43d036a0.tar.bz2 linux-764895d3039e903dac3a70f219949efe43d036a0.zip | |
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@rwth-aachen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/usb/sierra_net.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c index 631b1ed86610..d9440bc022f2 100644 --- a/drivers/net/usb/sierra_net.c +++ b/drivers/net/usb/sierra_net.c @@ -384,6 +384,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; @@ -417,13 +424,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; } |