Changeset ab936440 in mainline for uspace/lib/ieee80211/src/ieee80211.c

Timestamp:

2019-02-12T20:42:42Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:

• uspace/lib/ieee80211/src/ieee80211.c (modified) (3 diffs)

uspace/lib/ieee80211/src/ieee80211.c

@@ -479 +479 @@
 }
 
-extern bool ieee80211_query_using_key(ieee80211_dev_t *ieee80211_dev)
+bool ieee80211_query_using_key(ieee80211_dev_t *ieee80211_dev)
 {
         fibril_mutex_lock(&ieee80211_dev->gen_mutex);
@@ -803 +803 @@
         if (rc != EOK) {
                 ddf_fun_unbind(fun);
+                ddf_fun_destroy(fun);
                 return rc;
         }
@@ -809 +810 @@
         if (rc != EOK) {
                 ddf_fun_unbind(fun);
+                ddf_fun_destroy(fun);
                 return rc;
         }