diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2015-01-07 14:39:02 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-01-07 14:39:16 +0100 |
| commit | 3a4b0c948d286523ba062985c03487b55326eaae (patch) | |
| tree | 8c61bbeb09f9d810d3132919c22e8effcc4e545c /include/net | |
| parent | fa44b988d2da58334ecbcf3e00f9acccbdeace6c (diff) | |
| parent | 1e359a5de861a57aa04d92bb620f52a5c1d7f8b1 (diff) | |
| download | linux-3a4b0c948d286523ba062985c03487b55326eaae.tar.gz linux-3a4b0c948d286523ba062985c03487b55326eaae.tar.bz2 linux-3a4b0c948d286523ba062985c03487b55326eaae.zip | |
Merge branch 'mac80211' into mac80211-next
Merge mac80211.git to get some changes that would otherwise
cause conflicts with new changes coming here.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/mac80211.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 4913c00539fb..ece1a546587e 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -1281,8 +1281,7 @@ struct ieee80211_vif *wdev_to_ieee80211_vif(struct wireless_dev *wdev); * * @IEEE80211_KEY_FLAG_GENERATE_IV: This flag should be set by the * driver to indicate that it requires IV generation for this - * particular key. Setting this flag does not necessarily mean that SKBs - * will have sufficient tailroom for ICV or MIC. + * particular key. * @IEEE80211_KEY_FLAG_GENERATE_MMIC: This flag should be set by * the driver for a TKIP key if it requires Michael MIC * generation in software. @@ -1294,9 +1293,7 @@ struct ieee80211_vif *wdev_to_ieee80211_vif(struct wireless_dev *wdev); * @IEEE80211_KEY_FLAG_PUT_IV_SPACE: This flag should be set by the driver * if space should be prepared for the IV, but the IV * itself should not be generated. Do not set together with - * @IEEE80211_KEY_FLAG_GENERATE_IV on the same key. Setting this flag does - * not necessarily mean that SKBs will have sufficient tailroom for ICV or - * MIC. + * @IEEE80211_KEY_FLAG_GENERATE_IV on the same key. * @IEEE80211_KEY_FLAG_RX_MGMT: This key will be used to decrypt received * management frames. The flag can help drivers that have a hardware * crypto implementation that doesn't deal with management frames |