diff options
| author | Javier Cardona <javier@cozybit.com> | 2010-12-16 17:37:49 -0800 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-12-20 14:46:57 -0500 |
| commit | c80d545da3f7c0e534ccd4a780f322f80a92cff1 (patch) | |
| tree | edd5c51676b4677fc1a0b2fc692ffe97df863f25 /net/mac80211/tx.c | |
| parent | 24bdd9f4c9af75b33b438d60381a67626de0128d (diff) | |
| download | kernel_samsung_smdk4412-c80d545da3f7c0e534ccd4a780f322f80a92cff1.zip kernel_samsung_smdk4412-c80d545da3f7c0e534ccd4a780f322f80a92cff1.tar.gz kernel_samsung_smdk4412-c80d545da3f7c0e534ccd4a780f322f80a92cff1.tar.bz2 | |
mac80211: Let userspace enable and configure vendor specific path selection.
Userspace will now be allowed to toggle between the default path
selection algorithm (HWMP, implemented in the kernel), and a vendor
specific alternative. Also in the same patch, allow userspace to add
information elements to mesh beacons. This is accordance with the
Extensible Path Selection Framework specified in version 7.0 of the
802.11s draft.
Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 157bde9..f4b1b62 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -2290,7 +2290,8 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw, u8 *pos; /* headroom, head length, tail length and maximum TIM length */ - skb = dev_alloc_skb(local->tx_headroom + 400); + skb = dev_alloc_skb(local->tx_headroom + 400 + + sdata->u.mesh.vendor_ie_len); if (!skb) goto out; |