svn commit: r311860 - head/sys/net80211

[Adrian Chadd]

Yeah, oops! Thanks for getting it fixed!


-adrian


On 10 January 2017 at 09:23, Shawn Webb <shawn.webb at hardenedbsd.org> wrote:
> On Tue, Jan 10, 2017 at 07:21:07AM +0000, Adrian Chadd wrote:
>> Author: adrian
>> Date: Tue Jan 10 07:21:07 2017
>> New Revision: 311860
>> URL: https://svnweb.freebsd.org/changeset/base/311860
>>
>> Log:
>>   [net80211] add VHT action frame placeholders for when it's time to implement.
>>
>> Modified:
>>   head/sys/net80211/ieee80211_vht.c
>>
>> Modified: head/sys/net80211/ieee80211_vht.c
>> ==============================================================================
>> --- head/sys/net80211/ieee80211_vht.c Tue Jan 10 05:37:53 2017        (r311859)
>> +++ head/sys/net80211/ieee80211_vht.c Tue Jan 10 07:21:07 2017        (r311860)
>> @@ -85,9 +85,49 @@ __FBSDID("$FreeBSD$");
>>   * Look at mac80211/vht.c:ieee80211_vht_handle_opmode() for further details.
>>   */
>>
>> +static int
>> +vht_recv_action_placeholder(struct ieee80211_node *ni,
>> +    const struct ieee80211_frame *wh,
>> +    const uint8_t *frm, const uint8_t *efrm)
>> +{
>> +
>> +     ieee80211_note(ni->ni_vap, "%s: called; fc=0x%.2x/0x%.2x",
>> +         __func__,
>> +         wh->i_fc[0],
>> +         wh->i_fc[1]);
>> +
>> +     return (0);
>> +}
>> +
>> +static int
>> +vht_send_action_placeholder(struct ieee80211_node *ni,
>> +    int category, int action, void *arg0)
>> +{
>> +
>> +     ieee80211_note(ni->ni_vap, "%s: called; category=%d, action=%d",
>> +         __func__,
>> +         category,
>> +         action);
>> +     return (EINVAL);
>> +}
>> +
>
> This broke the build for kernel configurations that don't have the
> IEEE80211_DEBUG option set. ieee80211_note is only a valid function when
> IEEE80211_DEBUG is defined.
>
> Thanks,
>
> --
> Shawn Webb
> Cofounder and Security Engineer
> HardenedBSD
>
> GPG Key ID:          0x6A84658F52456EEE
> GPG Key Fingerprint: 2ABA B6BD EF6A F486 BE89  3D9E 6A84 658F 5245 6EEE