diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-02-09 16:21:25 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-02-09 16:21:25 +0800 |
| commit | 1203868ffa16d93234dc005fba95b6596b87ddb5 (patch) | |
| tree | 0e24f2baa99515d0045998361a2294e2b2b25484 /net/caif/cfpkt_skbuff.c | |
| parent | 03b862ce80d27a26f8add26a547b3dc7b4d561d6 (diff) | |
| parent | 054f8fe34189a62a0b87700c062a18c3a8421615 (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-androidlsk-v3.18-17.03-androidlsk-v3.18-17.02-android
Diffstat (limited to 'net/caif/cfpkt_skbuff.c')
| -rw-r--r-- | net/caif/cfpkt_skbuff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/caif/cfpkt_skbuff.c b/net/caif/cfpkt_skbuff.c index 1be0b521ac49..5add8e75759d 100644 --- a/net/caif/cfpkt_skbuff.c +++ b/net/caif/cfpkt_skbuff.c @@ -286,7 +286,7 @@ int cfpkt_setlen(struct cfpkt *pkt, u16 len) else skb_trim(skb, len); - return cfpkt_getlen(pkt); + return cfpkt_getlen(pkt); } /* Need to expand SKB */ |