diff --git a/[refs] b/[refs] index 7e82cce28b31..4fbad91a868f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ee5afbc9d2162f0919dd089023fb690f7cf8134 +refs/heads/master: 7ba1c04ed727a70df2dc63464232c0ec906ad67d diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h index e84c922a1b16..346f373fb676 100644 --- a/trunk/include/net/mac80211.h +++ b/trunk/include/net/mac80211.h @@ -1262,8 +1262,8 @@ enum ieee80211_ampdu_mlme_action { * the device does fragmentation by itself; if this method is assigned then * the stack will not do fragmentation. * - * @sta_notify: Notifies low level driver about addition or removal - * of associated station or AP. + * @sta_notify: Notifies low level driver about addition or removal of an + * associated station, AP, IBSS/WDS/mesh peer etc. Must be atomic. * * @sta_ps_notify: Notifies low level driver about the power state transition * of a associated station. Must be atomic.