Re: [PATCH 1/6] mac80211: fix mesh beacon format

[Johannes Berg <johannes@sipsolutions.net>]

On Mon, 2011-07-25 at 16:59 -0700, Thomas Pedersen wrote:

> -void mesh_mgmt_ies_add(struct sk_buff *skb, struct ieee80211_sub_if_data *sdata)
> +inline int
> +mesh_add_meshconf_ie(struct sk_buff *skb, struct ieee80211_sub_if_data *sdata)

Please don't manually mark any functions as inline -- the compiler will
do it for you where it makes sense.

> +++ b/net/mac80211/mesh.h
> @@ -199,6 +199,20 @@ bool mesh_matches_local(struct ieee802_11_elems *ie,
>  void mesh_ids_set_default(struct ieee80211_if_mesh *mesh);
>  void mesh_mgmt_ies_add(struct sk_buff *skb,
>  		struct ieee80211_sub_if_data *sdata);
> +inline int mesh_add_meshconf_ie(struct sk_buff *skb,
> +				struct ieee80211_sub_if_data *sdata);

Except it can't even do it... are you confused about how inline works?


> -		mgmt->u.beacon.capab_info = 0x0; /* 0x0 for MPs */
> +		mgmt->u.beacon.capab_info |= sdata->u.mesh.security
> +					     ? WLAN_CAPABILITY_PRIVACY
> +					     : 0;

Not really important, but it'd probably look better to write as
		mgmt->u.beacon.capa_info |=
			mesh.security ? ... : 0;
 
since then the ternary might fit on one line.

johannes