Deleted Added
full compact
if_run.c (289165) if_run.c (289753)
1/*-
2 * Copyright (c) 2008,2010 Damien Bergamini <damien.bergamini@free.fr>
3 * ported to FreeBSD by Akinori Furukoshi <moonlightakkiy@yahoo.ca>
4 * USB Consulting, Hans Petter Selasky <hselasky@freebsd.org>
5 * Copyright (c) 2013-2014 Kevin Lo
6 *
7 * Permission to use, copy, modify, and distribute this software for any
8 * purpose with or without fee is hereby granted, provided that the above

--- 4 unchanged lines hidden (view full) ---

13 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
14 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
15 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
16 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
17 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18 */
19
20#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2008,2010 Damien Bergamini <damien.bergamini@free.fr>
3 * ported to FreeBSD by Akinori Furukoshi <moonlightakkiy@yahoo.ca>
4 * USB Consulting, Hans Petter Selasky <hselasky@freebsd.org>
5 * Copyright (c) 2013-2014 Kevin Lo
6 *
7 * Permission to use, copy, modify, and distribute this software for any
8 * purpose with or without fee is hereby granted, provided that the above

--- 4 unchanged lines hidden (view full) ---

13 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
14 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
15 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
16 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
17 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18 */
19
20#include <sys/cdefs.h>
21__FBSDID("$FreeBSD: head/sys/dev/usb/wlan/if_run.c 289165 2015-10-12 04:55:20Z adrian $");
21__FBSDID("$FreeBSD: head/sys/dev/usb/wlan/if_run.c 289753 2015-10-22 12:15:40Z avos $");
22
23/*-
24 * Ralink Technology RT2700U/RT2800U/RT3000U/RT3900E chipset driver.
25 * http://www.ralinktech.com/
26 */
27
28#include <sys/param.h>
29#include <sys/sockio.h>

--- 2812 unchanged lines hidden (view full) ---

2842 }
2843
2844 ant = run_maxrssi_chain(sc, rxwi);
2845 rssi = rxwi->rssi[ant];
2846 nf = run_rssi2dbm(sc, rssi, ant);
2847
2848 m->m_pkthdr.len = m->m_len = len;
2849
22
23/*-
24 * Ralink Technology RT2700U/RT2800U/RT3000U/RT3900E chipset driver.
25 * http://www.ralinktech.com/
26 */
27
28#include <sys/param.h>
29#include <sys/sockio.h>

--- 2812 unchanged lines hidden (view full) ---

2842 }
2843
2844 ant = run_maxrssi_chain(sc, rxwi);
2845 rssi = rxwi->rssi[ant];
2846 nf = run_rssi2dbm(sc, rssi, ant);
2847
2848 m->m_pkthdr.len = m->m_len = len;
2849
2850 if (ni != NULL) {
2851 (void)ieee80211_input(ni, m, rssi, nf);
2852 ieee80211_free_node(ni);
2853 } else {
2854 (void)ieee80211_input_all(ic, m, rssi, nf);
2855 }
2856
2857 if (__predict_false(ieee80211_radiotap_active(ic))) {
2858 struct run_rx_radiotap_header *tap = &sc->sc_rxtap;
2859 uint16_t phy;
2860
2861 tap->wr_flags = 0;
2862 tap->wr_chan_freq = htole16(ic->ic_curchan->ic_freq);
2863 tap->wr_chan_flags = htole16(ic->ic_curchan->ic_flags);
2864 tap->wr_antsignal = rssi;

--- 22 unchanged lines hidden (view full) ---

2887 case 4: tap->wr_rate = 48; break;
2888 case 5: tap->wr_rate = 72; break;
2889 case 6: tap->wr_rate = 96; break;
2890 case 7: tap->wr_rate = 108; break;
2891 }
2892 break;
2893 }
2894 }
2850 if (__predict_false(ieee80211_radiotap_active(ic))) {
2851 struct run_rx_radiotap_header *tap = &sc->sc_rxtap;
2852 uint16_t phy;
2853
2854 tap->wr_flags = 0;
2855 tap->wr_chan_freq = htole16(ic->ic_curchan->ic_freq);
2856 tap->wr_chan_flags = htole16(ic->ic_curchan->ic_flags);
2857 tap->wr_antsignal = rssi;

--- 22 unchanged lines hidden (view full) ---

2880 case 4: tap->wr_rate = 48; break;
2881 case 5: tap->wr_rate = 72; break;
2882 case 6: tap->wr_rate = 96; break;
2883 case 7: tap->wr_rate = 108; break;
2884 }
2885 break;
2886 }
2887 }
2888
2889 if (ni != NULL) {
2890 (void)ieee80211_input(ni, m, rssi, nf);
2891 ieee80211_free_node(ni);
2892 } else {
2893 (void)ieee80211_input_all(ic, m, rssi, nf);
2894 }
2895}
2896
2897static void
2898run_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error)
2899{
2900 struct run_softc *sc = usbd_xfer_softc(xfer);
2901 struct ieee80211com *ic = &sc->sc_ic;
2902 struct mbuf *m = NULL;

--- 3371 unchanged lines hidden ---
2895}
2896
2897static void
2898run_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error)
2899{
2900 struct run_softc *sc = usbd_xfer_softc(xfer);
2901 struct ieee80211com *ic = &sc->sc_ic;
2902 struct mbuf *m = NULL;

--- 3371 unchanged lines hidden ---