summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-01-02 14:24:59 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-01-02 14:24:59 -0800
commit39d46f4b216dbdc596d427d33adaf6e15531a791 (patch)
tree5e058bf6b57827fa4a7ac2d0af1e74e90d87548e /net
parent83dbf65a2d0a211d6c923715870aa640bad1733a (diff)
parent138818a6eb5ada892b2ff6af7f2d12e7df2a7435 (diff)
Merge "rmnet_data: queue QMAP control packets if start_xmit fails"
Diffstat (limited to 'net')
-rw-r--r--net/rmnet_data/rmnet_map_command.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/net/rmnet_data/rmnet_map_command.c b/net/rmnet_data/rmnet_map_command.c
index 055d5f402957..9dac2b27d4c3 100644
--- a/net/rmnet_data/rmnet_map_command.c
+++ b/net/rmnet_data/rmnet_map_command.c
@@ -121,6 +121,7 @@ static void rmnet_map_send_ack(struct sk_buff *skb,
{
struct rmnet_map_control_command_s *cmd;
int xmit_status;
+ int rc;
if (unlikely(!skb))
BUG();
@@ -149,6 +150,15 @@ static void rmnet_map_send_ack(struct sk_buff *skb,
netif_tx_unlock(skb->dev);
LOGD("MAP command ACK=%hhu sent with rc: %d", type & 0x03, xmit_status);
+
+ if (xmit_status != NETDEV_TX_OK) {
+ rc = dev_queue_xmit(skb);
+ if (rc != 0) {
+ LOGD("Failed to queue packet for transmission on [%s]",
+ skb->dev->name);
+ }
+ }
+
}
/**