diff options
| author | Stefan Sperling <stsp@cvs.openbsd.org> | 2016-09-22 08:28:39 +0000 |
|---|---|---|
| committer | Stefan Sperling <stsp@cvs.openbsd.org> | 2016-09-22 08:28:39 +0000 |
| commit | b1031c3814691f6ebdf27decfa7491cd4e1433e3 (patch) | |
| tree | 3e3548791e123478ae33e0e6f7b11e6de266794b /sys/dev/pci/if_iwm.c | |
| parent | 6b1f5e8c6d9c1fd6f57723123999656439141d19 (diff) | |
Remove some unused cruft from iwm, including a local namespace-polluting
definition of an ieee80211_tu_to_usec() macro...
Diffstat (limited to 'sys/dev/pci/if_iwm.c')
| -rw-r--r-- | sys/dev/pci/if_iwm.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c index 2480762ad24..d078862195e 100644 --- a/sys/dev/pci/if_iwm.c +++ b/sys/dev/pci/if_iwm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwm.c,v 1.140 2016/09/22 08:27:56 stsp Exp $ */ +/* $OpenBSD: if_iwm.c,v 1.141 2016/09/22 08:28:38 stsp Exp $ */ /* * Copyright (c) 2014, 2016 genua gmbh <info@genua.de> @@ -389,8 +389,6 @@ int iwm_disable_beacon_filter(struct iwm_softc *); int iwm_add_sta_cmd(struct iwm_softc *, struct iwm_node *, int); int iwm_add_aux_sta(struct iwm_softc *); uint16_t iwm_scan_rx_chain(struct iwm_softc *); -uint32_t iwm_scan_max_out_time(struct iwm_softc *, uint32_t, int); -uint32_t iwm_scan_suspend_time(struct iwm_softc *, int); uint32_t iwm_scan_rate_n_flags(struct iwm_softc *, int, int); uint16_t iwm_get_active_dwell(struct iwm_softc *, int, int); uint16_t iwm_get_passive_dwell(struct iwm_softc *, int); @@ -4422,26 +4420,6 @@ iwm_scan_rx_chain(struct iwm_softc *sc) return htole16(rx_chain); } -#define ieee80211_tu_to_usec(a) (1024*(a)) - -uint32_t -iwm_scan_max_out_time(struct iwm_softc *sc, uint32_t flags, int is_assoc) -{ - if (!is_assoc) - return 0; - if (flags & 0x1) - return htole32(ieee80211_tu_to_usec(SHORT_OUT_TIME_PERIOD)); - return htole32(ieee80211_tu_to_usec(LONG_OUT_TIME_PERIOD)); -} - -uint32_t -iwm_scan_suspend_time(struct iwm_softc *sc, int is_assoc) -{ - if (!is_assoc) - return 0; - return htole32(ieee80211_tu_to_usec(SUSPEND_TIME_PERIOD)); -} - uint32_t iwm_scan_rate_n_flags(struct iwm_softc *sc, int flags, int no_cck) { |