lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream

Browse Source
This commit is contained in:
Jeff Garzik
2007-02-17 15:09:59 -05:00
parent 1a1689344a 4409d28140
commit 48c871c1f6
2243 changed files with 57344 additions and 41439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/ieee80211/ieee80211_tx.c
View File

@@ -54,7 +54,7 @@ Desc. | ctrl | dura | DA/RA | TA | SA | Sequ | Frame | fcs |
| | tion | (BSSID) | | | ence | data | |
`--------------------------------------------------| |------'
Total: 28 non-data bytes `----.----'
|
|
.- 'Frame data' expands, if WEP enabled, to <----------'
|
V
@@ -64,8 +64,8 @@ Bytes | 4 | 0-2296 | 4 |
Desc. | IV | Encrypted | ICV |
| | Packet | |
`-----| |-----'
`-----.-----'
|
`-----.-----'
|
.- 'Encrypted Packet' expands to
|
V