diff options
author | thompsa <thompsa@FreeBSD.org> | 2008-05-01 04:55:00 +0000 |
---|---|---|
committer | thompsa <thompsa@FreeBSD.org> | 2008-05-01 04:55:00 +0000 |
commit | a96561521e584f7ce37efdbc079f9f3d125f8f39 (patch) | |
tree | b983721c7e7ac121297fd8475a3fd70e7cdc0166 /sys/dev/iwi/if_iwi.c | |
parent | baf49360e8bbe44e4ec849b9c8e2374de1cb3f12 (diff) | |
download | FreeBSD-src-a96561521e584f7ce37efdbc079f9f3d125f8f39.zip FreeBSD-src-a96561521e584f7ce37efdbc079f9f3d125f8f39.tar.gz |
Unify all the wifi *_ioctl routines
- Limit grabbing the lock to SIOCSIFFLAGS.
- Move ieee80211_start_all() to SIOCSIFFLAGS.
- Remove SIOCSIFMEDIA as it is not useful.
- Limit ether_ioctl to only SIOCGIFADDR. SIOCSIFADDR and SIOCSIFMTU have no
affect as there is no input/output path in the vap parent. The vap code
will handle the reinit of the mac address changes.
- Split off ndis_ioctl_80211 as it was getting too different to wired devices.
This fixes a copyout while locked and a lock recursion.
Reviewed by: sam
Diffstat (limited to 'sys/dev/iwi/if_iwi.c')
-rw-r--r-- | sys/dev/iwi/if_iwi.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sys/dev/iwi/if_iwi.c b/sys/dev/iwi/if_iwi.c index 1ddb59b..ed9bcff 100644 --- a/sys/dev/iwi/if_iwi.c +++ b/sys/dev/iwi/if_iwi.c @@ -2052,9 +2052,9 @@ iwi_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) int error = 0, startall = 0; IWI_LOCK_DECL; - IWI_LOCK(sc); switch (cmd) { case SIOCSIFFLAGS: + IWI_LOCK(sc); if (ifp->if_flags & IFF_UP) { if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) { iwi_init_locked(sc); @@ -2064,19 +2064,20 @@ iwi_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) if (ifp->if_drv_flags & IFF_DRV_RUNNING) iwi_stop_locked(sc); } + IWI_UNLOCK(sc); + if (startall) + ieee80211_start_all(ic); break; case SIOCGIFMEDIA: - case SIOCSIFMEDIA: error = ifmedia_ioctl(ifp, ifr, &ic->ic_media, cmd); break; - default: + case SIOCGIFADDR: error = ether_ioctl(ifp, cmd, data); break; + default: + error = EINVAL; + break; } - IWI_UNLOCK(sc); - - if (startall) - ieee80211_start_all(ic); return error; } |