Commit 44d7a8cf authored by Denis Vlasenko's avatar Denis Vlasenko Committed by John W. Linville
Browse files

[PATCH] WEP fields are incorrectly shown to be INSIDE snap in the doc 



>If encryption is enabled, each fragment payload size is reduced by enough space
>to add the prefix and postfix (IV and ICV totalling 8 bytes in the case of WEP)
>So if you have 1500 bytes of payload with ieee->fts set to 500 without
>encryption it will take 3 frames.  With WEP it will take 4 frames as the
>payload of each frame is reduced to 492 bytes.

Text is correct, but in picture (IV,payload,ICV) sits inside SNAP.
Patch corrects this.

Signed-Off-By: default avatarDenis Vlasenko <vda@ilport.com.ua>
Acked-By: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4a99ac3a

net/ieee80211/ieee80211_tx.c

+13 −13
Original line number Diff line number Diff line
@@ -56,7 +56,18 @@ Desc. | ctrl | dura | DA/RA | TA | SA | Sequ | Frame | fcs | 
      `--------------------------------------------------|         |------'

Total: 28 non-data bytes                                 `----.----'

                                                              |

       .- 'Frame data' expands to <---------------------------'

       .- 'Frame data' expands, if WEP enabled, to <----------'

       |

       V

      ,-----------------------.

Bytes |  4  |   0-2296  |  4  |

      |-----|-----------|-----|

Desc. | IV  | Encrypted | ICV |

      |     | Packet    |     |

      `-----|           |-----'

            `-----.-----'

                  |

       .- 'Encrypted Packet' expands to

       |

       V

      ,---------------------------------------------------.
@@ -65,18 +76,7 @@ Bytes | 1 | 1 | 1 | 3 | 2 | 0-2304 | 
Desc. | SNAP | SNAP | Control |Eth Tunnel| Type | IP      |

      | DSAP | SSAP |         |          |      | Packet  |

      | 0xAA | 0xAA |0x03 (UI)|0x00-00-F8|      |         |

      `-----------------------------------------|         |

Total: 8 non-data bytes                         `----.----'

                                                     |

       .- 'IP Packet' expands, if WEP enabled, to <--'

       |

       V

      ,-----------------------.

Bytes |  4  |   0-2296  |  4  |

      |-----|-----------|-----|

Desc. | IV  | Encrypted | ICV |

      |     | IP Packet |     |

      `-----------------------'

      `----------------------------------------------------

Total: 8 non-data bytes



802.3 Ethernet Data Frame

CRA Git | Maintained and supported by SUSTech CRA and CCSE