diff options
Diffstat (limited to 'at76_usb.c')
| -rw-r--r-- | at76_usb.c | 20 |
1 files changed, 8 insertions, 12 deletions
@@ -4153,7 +4153,7 @@ static int at76_load_internal_fw(struct usb_device *udev, struct fwentry *fwe) return ret; } -static int at76_essid_matched(struct at76_priv *priv, struct bss_info *ptr) +static int at76_match_essid(struct at76_priv *priv, struct bss_info *ptr) { /* common criteria for both modi */ @@ -4167,8 +4167,7 @@ static int at76_essid_matched(struct at76_priv *priv, struct bss_info *ptr) return ret; } -static inline int at76_mode_matched(struct at76_priv *priv, - struct bss_info *ptr) +static inline int at76_match_mode(struct at76_priv *priv, struct bss_info *ptr) { int ret; @@ -4183,7 +4182,7 @@ static inline int at76_mode_matched(struct at76_priv *priv, return ret; } -static int at76_rates_matched(struct at76_priv *priv, struct bss_info *ptr) +static int at76_match_rates(struct at76_priv *priv, struct bss_info *ptr) { int i; u8 *rate; @@ -4213,7 +4212,7 @@ static int at76_rates_matched(struct at76_priv *priv, struct bss_info *ptr) return 1; } -static inline int at76_wep_matched(struct at76_priv *priv, struct bss_info *ptr) +static inline int at76_match_wep(struct at76_priv *priv, struct bss_info *ptr) { if (!priv->wep_enabled && ptr->capa & WLAN_CAPABILITY_PRIVACY) { /* we have disabled WEP, but the BSS signals privacy */ @@ -4227,8 +4226,7 @@ static inline int at76_wep_matched(struct at76_priv *priv, struct bss_info *ptr) return 1; } -static inline int at76_bssid_matched(struct at76_priv *priv, - struct bss_info *ptr) +static inline int at76_match_bssid(struct at76_priv *priv, struct bss_info *ptr) { if (!priv->wanted_bssid_valid || !compare_ether_addr(ptr->bssid, priv->wanted_bssid)) { @@ -4262,11 +4260,9 @@ static struct bss_info *at76_match_bss(struct at76_priv *priv, curr = last != NULL ? last->list.next : priv->bss_list.next; while (curr != &priv->bss_list) { ptr = list_entry(curr, struct bss_info, list); - if (at76_essid_matched(priv, ptr) && - at76_mode_matched(priv, ptr) && - at76_wep_matched(priv, ptr) && - at76_rates_matched(priv, ptr) && - at76_bssid_matched(priv, ptr)) + if (at76_match_essid(priv, ptr) && at76_match_mode(priv, ptr) + && at76_match_wep(priv, ptr) && at76_match_rates(priv, ptr) + && at76_match_bssid(priv, ptr)) break; curr = curr->next; } |