diff options
| author | Daniel Wagner <wagi@monom.org> | 2018-04-03 17:10:30 +0200 |
|---|---|---|
| committer | Daniel Wagner <wagi@monom.org> | 2018-04-03 17:10:30 +0200 |
| commit | 723e52ebf702b7dc5904552d09cc4de7cbe70913 (patch) | |
| tree | 7eddce890ca246b352be32dcc0aa5852763acee8 /drivers/hsi/clients/ssi_protocol.c | |
| parent | 2f41b395fd2ef30c58f89816b0063159796f4410 (diff) | |
| parent | b766b14a48de577e5060e4d8762f1e4a34229d2b (diff) | |
Merge tag 'v4.4.124' into v4.4-rt
This is the 4.4.124 stable release
Diffstat (limited to 'drivers/hsi/clients/ssi_protocol.c')
| -rw-r--r-- | drivers/hsi/clients/ssi_protocol.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/hsi/clients/ssi_protocol.c b/drivers/hsi/clients/ssi_protocol.c index a38af68cf326..0a0628d11c0b 100644 --- a/drivers/hsi/clients/ssi_protocol.c +++ b/drivers/hsi/clients/ssi_protocol.c @@ -976,7 +976,7 @@ static int ssip_pn_xmit(struct sk_buff *skb, struct net_device *dev) goto drop; /* Pad to 32-bits - FIXME: Revisit*/ if ((skb->len & 3) && skb_pad(skb, 4 - (skb->len & 3))) - goto drop; + goto inc_dropped; /* * Modem sends Phonet messages over SSI with its own endianess... @@ -1028,8 +1028,9 @@ static int ssip_pn_xmit(struct sk_buff *skb, struct net_device *dev) drop2: hsi_free_msg(msg); drop: - dev->stats.tx_dropped++; dev_kfree_skb(skb); +inc_dropped: + dev->stats.tx_dropped++; return 0; } |