diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2005-02-17 17:43:32 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2005-02-17 17:43:32 +0000 |
| commit | 9a1e8d3a36cfe08049fdc4373b501abf7b1454c1 (patch) | |
| tree | 3beb81911abc61d51cca7ebe19cd80f62a1874a1 | |
| parent | 317d987ff7524f620eb3e301cdf98e33d946c7be (diff) | |
add software WEP (will implement hardware WEP later).
| -rw-r--r-- | sys/dev/ic/ral.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/sys/dev/ic/ral.c b/sys/dev/ic/ral.c index 2b7f1e7f1c7..1071b2d9ba7 100644 --- a/sys/dev/ic/ral.c +++ b/sys/dev/ic/ral.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ral.c,v 1.4 2005/02/17 17:38:12 damien Exp $ */ +/* $OpenBSD: ral.c,v 1.5 2005/02/17 17:43:31 damien Exp $ */ /*- * Copyright (c) 2005 @@ -1403,9 +1403,9 @@ ral_tx_bcn(struct ral_softc *sc, struct mbuf *m0, struct ieee80211_node *ni) wh = mtod(m0, struct ieee80211_frame *); /* XXX beacons are always sent at 2Mbps */ - error = ieee80211_compute_duration(wh, m0->m_pkthdr.len, ic->ic_flags, - ic->ic_fragthreshold, 4, &d0, &dn, &npkt, - ifp->if_flags & IFF_DEBUG); + error = ieee80211_compute_duration(wh, m0->m_pkthdr.len, + ic->ic_flags & ~IEEE80211_F_WEPON, ic->ic_fragthreshold, 4, &d0, + &dn, &npkt, ifp->if_flags & IFF_DEBUG); if (error != 0) { printf("%s: could not compute duration\n", sc->sc_dev.dv_xname); m_freem(m0); @@ -1470,9 +1470,9 @@ ral_tx_mgt(struct ral_softc *sc, struct mbuf *m0, struct ieee80211_node *ni) wh = mtod(m0, struct ieee80211_frame *); /* XXX management frames are always sent at 2Mbps */ - error = ieee80211_compute_duration(wh, m0->m_pkthdr.len, ic->ic_flags, - ic->ic_fragthreshold, 4, &d0, &dn, &npkt, - ifp->if_flags & IFF_DEBUG); + error = ieee80211_compute_duration(wh, m0->m_pkthdr.len, + ic->ic_flags & ~IEEE80211_F_WEPON, ic->ic_fragthreshold, 4, &d0, + &dn, &npkt, ifp->if_flags & IFF_DEBUG); if (error != 0) { printf("%s: could not compute duration\n", sc->sc_dev.dv_xname); m_freem(m0); @@ -1562,6 +1562,12 @@ ral_tx_data(struct ral_softc *sc, struct mbuf *m0, struct ieee80211_node *ni) return error; } + if (ic->ic_flags & IEEE80211_F_WEPON) { + m0 = ieee80211_wep_crypt(ifp, m0, 1); + if (m0 == NULL) + return ENOBUFS; + } + if (m0->m_pkthdr.len > ic->ic_rtsthreshold) { desc = &sc->txq.desc[sc->txq.cur_encrypt]; data = &sc->txq.data[sc->txq.cur_encrypt]; |