diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-05-22 15:24:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-22 15:24:26 -0400 |
| commit | beb584275bdb5633cbb4c6d1bfb424958ecebfea (patch) | |
| tree | 102a05e3d4e325e8551a342c6a8b587571d29adf | |
| parent | net: davinci_emac: fix oops caused by uninitialized ndev->dev (diff) | |
| parent | mac802154: llsec: fold useless return value check (diff) | |
Merge branch 'mac80211'
Phoebe Buckheister says:
====================
mac802154: llsec oversights
Fixes an unlock operation not matching a previous lock operation in an
unlikely error path and removes a redundant check.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/mac802154/llsec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac802154/llsec.c b/net/mac802154/llsec.c index a83674edaafd..08d08cbf51f4 100644 --- a/net/mac802154/llsec.c +++ b/net/mac802154/llsec.c @@ -773,10 +773,10 @@ int mac802154_llsec_encrypt(struct mac802154_llsec *sec, struct sk_buff *skb) rc = llsec_do_encrypt(skb, sec, &hdr, key); llsec_key_put(key); - return rc < 0 ? rc : 0; + return rc; fail_read: - read_unlock(&sec->lock); + read_unlock_bh(&sec->lock); fail: rcu_read_unlock(); return rc; |