diff --git a/[refs] b/[refs] index 3bc43c215130..09a088c9b93a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 478f8d2ba56b40ad1c17e21c1503669b83c96e8e +refs/heads/master: 5ecc2a5d3e3c39535d2cc10dad15853e9e9b072d diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h index 9bc03f053af0..5fcc4c104340 100644 --- a/trunk/include/net/mac80211.h +++ b/trunk/include/net/mac80211.h @@ -996,7 +996,14 @@ enum ieee80211_erp_change_flags { * * @beacon_update: Setup beacon data for IBSS beacons. Unlike access point, * IBSS uses a fixed beacon frame which is configured using this - * function. This handler is required only for IBSS mode. + * function. + * If the driver returns success (0) from this callback, it owns + * the skb. That means the driver is responsible to kfree_skb() it. + * The control structure is not dynamically allocated. That means the + * driver does not own the pointer and if it needs it somewhere + * outside of the context of this function, it must copy it + * somewhere else. + * This handler is required only for IBSS mode. * * @tx_last_beacon: Determine whether the last IBSS beacon was sent by us. * This is needed only for IBSS mode and the result of this function is