diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:09:59 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:09:59 -0500 |
| commit | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (patch) | |
| tree | da3aa535c98cc0957851354ceb0fbff7482d7a9d /net/ieee80211/ieee80211_tx.c | |
| parent | 1a1689344add3333d28d1b5495d8043a3877d01c (diff) | |
| parent | 4409d28140d9a6e6e3f4f1fdaf7234c4b965d954 (diff) | |
Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream
Diffstat (limited to 'net/ieee80211/ieee80211_tx.c')
| -rw-r--r-- | net/ieee80211/ieee80211_tx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c index 54e01160166f..0292d6348e12 100644 --- a/net/ieee80211/ieee80211_tx.c +++ b/net/ieee80211/ieee80211_tx.c | |||
| @@ -54,7 +54,7 @@ Desc. | ctrl | dura | DA/RA | TA | SA | Sequ | Frame | fcs | | |||
| 54 | | | tion | (BSSID) | | | ence | data | | | 54 | | | tion | (BSSID) | | | ence | data | | |
| 55 | `--------------------------------------------------| |------' | 55 | `--------------------------------------------------| |------' |
| 56 | Total: 28 non-data bytes `----.----' | 56 | Total: 28 non-data bytes `----.----' |
| 57 | | | 57 | | |
| 58 | .- 'Frame data' expands, if WEP enabled, to <----------' | 58 | .- 'Frame data' expands, if WEP enabled, to <----------' |
| 59 | | | 59 | | |
| 60 | V | 60 | V |
| @@ -64,8 +64,8 @@ Bytes | 4 | 0-2296 | 4 | | |||
| 64 | Desc. | IV | Encrypted | ICV | | 64 | Desc. | IV | Encrypted | ICV | |
| 65 | | | Packet | | | 65 | | | Packet | | |
| 66 | `-----| |-----' | 66 | `-----| |-----' |
| 67 | `-----.-----' | 67 | `-----.-----' |
| 68 | | | 68 | | |
| 69 | .- 'Encrypted Packet' expands to | 69 | .- 'Encrypted Packet' expands to |
| 70 | | | 70 | | |
| 71 | V | 71 | V |