Commit 751ad819 authored by David S. Miller's avatar David S. Miller

Merge tag 'mac80211-for-davem-2016-06-29-v2' of...

Merge tag 'mac80211-for-davem-2016-06-29-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

Johannes Berg says:

====================
Just two small fixes
 * fix mesh peer link counter, decrement wasn't always done at all
 * fix ethertype (length) for packets without RFC 1042 or bridge
   tunnel header
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d913d3a7 c041778c
...@@ -148,14 +148,17 @@ u32 mesh_accept_plinks_update(struct ieee80211_sub_if_data *sdata) ...@@ -148,14 +148,17 @@ u32 mesh_accept_plinks_update(struct ieee80211_sub_if_data *sdata)
void mesh_sta_cleanup(struct sta_info *sta) void mesh_sta_cleanup(struct sta_info *sta)
{ {
struct ieee80211_sub_if_data *sdata = sta->sdata; struct ieee80211_sub_if_data *sdata = sta->sdata;
u32 changed; u32 changed = 0;
/* /*
* maybe userspace handles peer allocation and peering, but in either * maybe userspace handles peer allocation and peering, but in either
* case the beacon is still generated by the kernel and we might need * case the beacon is still generated by the kernel and we might need
* an update. * an update.
*/ */
changed = mesh_accept_plinks_update(sdata); if (sdata->u.mesh.user_mpm &&
sta->mesh->plink_state == NL80211_PLINK_ESTAB)
changed |= mesh_plink_dec_estab_count(sdata);
changed |= mesh_accept_plinks_update(sdata);
if (!sdata->u.mesh.user_mpm) { if (!sdata->u.mesh.user_mpm) {
changed |= mesh_plink_deactivate(sta); changed |= mesh_plink_deactivate(sta);
del_timer_sync(&sta->mesh->plink_timer); del_timer_sync(&sta->mesh->plink_timer);
......
...@@ -509,7 +509,7 @@ static int __ieee80211_data_to_8023(struct sk_buff *skb, struct ethhdr *ehdr, ...@@ -509,7 +509,7 @@ static int __ieee80211_data_to_8023(struct sk_buff *skb, struct ethhdr *ehdr,
* replace EtherType */ * replace EtherType */
hdrlen += ETH_ALEN + 2; hdrlen += ETH_ALEN + 2;
else else
tmp.h_proto = htons(skb->len); tmp.h_proto = htons(skb->len - hdrlen);
pskb_pull(skb, hdrlen); pskb_pull(skb, hdrlen);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment