diff options
| author | phk <phk@FreeBSD.org> | 2009-09-08 13:19:05 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2009-09-08 13:19:05 +0000 |
| commit | 52972616516a18e69bb2849c2f2e718ee644b27f (patch) | |
| tree | 9f7c1709b6ce492cd874120e81e8a117cab4ca7d /sys/dev/usb/wlan/if_rum.c | |
| parent | 2314521104388ada19392a3b2cdaca4ba6f82243 (diff) | |
| download | FreeBSD-src-52972616516a18e69bb2849c2f2e718ee644b27f.zip FreeBSD-src-52972616516a18e69bb2849c2f2e718ee644b27f.tar.gz | |
Revert previous commit and add myself to the list of people who should
know better than to commit with a cat in the area.
Diffstat (limited to 'sys/dev/usb/wlan/if_rum.c')
| -rw-r--r-- | sys/dev/usb/wlan/if_rum.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/dev/usb/wlan/if_rum.c b/sys/dev/usb/wlan/if_rum.c index 6af6ec2..7abd104 100644 --- a/sys/dev/usb/wlan/if_rum.c +++ b/sys/dev/usb/wlan/if_rum.c @@ -42,9 +42,12 @@ __FBSDID("$FreeBSD$"); #include <sys/kdb.h> #include <machine/bus.h> +#include <machine/resource.h> +#include <sys/rman.h> #include <net/bpf.h> #include <net/if.h> +#include <net/if_arp.h> #include <net/ethernet.h> #include <net/if_dl.h> #include <net/if_media.h> @@ -1486,7 +1489,7 @@ rum_rf_write(struct rum_softc *sc, uint8_t reg, uint32_t val) return; } - tmp = RT2573_RF_BUSY | RT2573_RF_20BIT | ((val & 0xfffff) << 2) | + tmp = RT2573_RF_BUSY | RT2573_RF_20BIT | (val & 0xfffff) << 2 | (reg & 3); rum_write(sc, RT2573_PHY_CSR4, tmp); |
