diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2012-09-09 13:57:09 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-09 13:57:09 -0700 |
| commit | 8084af89d283ed015e28a5eb781726ae5e138cf0 (patch) | |
| tree | bf7806145df30fa8eed9892ff502441e120aab14 /wpa_supplicant | |
| parent | 66bf9c42970e42704a1618642662b9bc4997abfa (diff) | |
| parent | 1e6c57fee4a56b421cc20f6dc0785c9138b21337 (diff) | |
| download | external_wpa_supplicant_8-8084af89d283ed015e28a5eb781726ae5e138cf0.zip external_wpa_supplicant_8-8084af89d283ed015e28a5eb781726ae5e138cf0.tar.gz external_wpa_supplicant_8-8084af89d283ed015e28a5eb781726ae5e138cf0.tar.bz2 | |
Merge "nl80211: Register read_sta_data() handler for station only builds" into jb-mr1-dev
Diffstat (limited to 'wpa_supplicant')
| -rw-r--r-- | wpa_supplicant/ctrl_iface.c | 5 | ||||
| -rw-r--r-- | wpa_supplicant/driver_i.h | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c index 8d0d71a..1203323 100644 --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c @@ -4331,6 +4331,7 @@ static int wpa_supplicant_signal_poll(struct wpa_supplicant *wpa_s, char *buf, return ret; } + static int wpa_supplicant_pktcnt_poll(struct wpa_supplicant *wpa_s, char *buf, size_t buflen) { @@ -4342,8 +4343,8 @@ static int wpa_supplicant_pktcnt_poll(struct wpa_supplicant *wpa_s, char *buf, return -1; ret = os_snprintf(buf, buflen, "TXGOOD=%lu\nTXBAD=%lu\nRXGOOD=%lu\n", - sta.tx_packets, sta.tx_retry_failed, sta.rx_packets); - if (ret < 0 || (unsigned int) ret > buflen) + sta.tx_packets, sta.tx_retry_failed, sta.rx_packets); + if (ret < 0 || (size_t) ret > buflen) return -1; return ret; } diff --git a/wpa_supplicant/driver_i.h b/wpa_supplicant/driver_i.h index ee9f6b0..bc148ca 100644 --- a/wpa_supplicant/driver_i.h +++ b/wpa_supplicant/driver_i.h @@ -467,7 +467,8 @@ static inline int wpa_drv_pktcnt_poll(struct wpa_supplicant *wpa_s, struct hostap_sta_driver_data *sta) { if (wpa_s->driver->read_sta_data) - return wpa_s->driver->read_sta_data(wpa_s->drv_priv, sta, wpa_s->bssid); + return wpa_s->driver->read_sta_data(wpa_s->drv_priv, sta, + wpa_s->bssid); return -1; } |