diff options
| author | Sjoerd Simons <sjoerd@luon.net> | 2014-04-26 20:55:09 +0200 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd@luon.net> | 2014-04-26 20:55:09 +0200 |
| commit | 59c3714a494c3b3765657c0551ad82842d98a7d2 (patch) | |
| tree | e4dcdf9791fc40581f02bfaf870c30b102b3133a /src/wifi | |
| parent | a4256940da049f91bbbea5e53e469a59ea9c10f7 (diff) | |
Imported Upstream version 0.9.8.10 upstream/0.9.8.10
Diffstat (limited to 'src/wifi')
| -rw-r--r-- | src/wifi/Makefile.am | 14 | ||||
| -rw-r--r-- | src/wifi/Makefile.in | 16 | ||||
| -rw-r--r-- | src/wifi/wifi-utils-nl80211.c | 9 |
3 files changed, 23 insertions, 16 deletions
diff --git a/src/wifi/Makefile.am b/src/wifi/Makefile.am index c9a1b474..41007432 100644 --- a/src/wifi/Makefile.am +++ b/src/wifi/Makefile.am @@ -1,11 +1,3 @@ -INCLUDES = \ - -I${top_srcdir}/include \ - -I${top_builddir}/include \ - -I${top_srcdir}/src/logging \ - -I${top_srcdir}/libnm-util \ - -I${top_builddir}/libnm-util \ - -I${top_srcdir}/src - noinst_LTLIBRARIES = libwifi-utils.la libwifi_utils_la_SOURCES = \ @@ -20,6 +12,12 @@ libwifi_utils_la_SOURCES += wifi-utils-wext.c wifi-utils-wext.h endif libwifi_utils_la_CPPFLAGS = \ + -I${top_srcdir}/include \ + -I${top_builddir}/include \ + -I${top_srcdir}/src/logging \ + -I${top_srcdir}/libnm-util \ + -I${top_builddir}/libnm-util \ + -I${top_srcdir}/src \ $(GLIB_CFLAGS) \ $(LIBNL_CFLAGS) diff --git a/src/wifi/Makefile.in b/src/wifi/Makefile.in index 20ccb537..cace5d68 100644 --- a/src/wifi/Makefile.in +++ b/src/wifi/Makefile.in @@ -211,6 +211,7 @@ DEPDIR = @DEPDIR@ DHCLIENT_PATH = @DHCLIENT_PATH@ DHCPCD_PATH = @DHCPCD_PATH@ DLLTOOL = @DLLTOOL@ +DNSMASQ_PATH = @DNSMASQ_PATH@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -233,6 +234,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -417,19 +419,17 @@ with_dhclient = @with_dhclient@ with_dhcpcd = @with_dhcpcd@ with_netconfig = @with_netconfig@ with_resolvconf = @with_resolvconf@ -INCLUDES = \ - -I${top_srcdir}/include \ - -I${top_builddir}/include \ - -I${top_srcdir}/src/logging \ - -I${top_srcdir}/libnm-util \ - -I${top_builddir}/libnm-util \ - -I${top_srcdir}/src - noinst_LTLIBRARIES = libwifi-utils.la libwifi_utils_la_SOURCES = wifi-utils.c wifi-utils.h \ wifi-utils-private.h wifi-utils-nl80211.c wifi-utils-nl80211.h \ $(am__append_1) libwifi_utils_la_CPPFLAGS = \ + -I${top_srcdir}/include \ + -I${top_builddir}/include \ + -I${top_srcdir}/src/logging \ + -I${top_srcdir}/libnm-util \ + -I${top_builddir}/libnm-util \ + -I${top_srcdir}/src \ $(GLIB_CFLAGS) \ $(LIBNL_CFLAGS) diff --git a/src/wifi/wifi-utils-nl80211.c b/src/wifi/wifi-utils-nl80211.c index 486a6951..5f909c44 100644 --- a/src/wifi/wifi-utils-nl80211.c +++ b/src/wifi/wifi-utils-nl80211.c @@ -132,6 +132,15 @@ _nl80211_send_and_recv (struct nl_sock *nl_sock, while (!done) { err = nl_recvmsgs (nl_sock, cb); if (err && err != -NLE_AGAIN) { + /* Kernel scan list can change while we are dumping it, as new scan + * results from H/W can arrive. BSS info is assured to be consistent + * and we don't need consistent view of whole scan list. Hence do + * not warn on DUMP_INTR error for get scan command. + */ + if (err == -NLE_DUMP_INTR && + genlmsg_hdr(nlmsg_hdr(msg))->cmd == NL80211_CMD_GET_SCAN) + break; + nm_log_warn (LOGD_WIFI, "nl_recvmsgs() error: (%d) %s", err, nl_geterror (err)); break; |