Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 89831
b: refs/heads/master
c: 7d185b8
h: refs/heads/master
i:
  89829: 3879839
  89827: 2e162b5
  89823: 8efb693
v: v3
  • Loading branch information
Johannes Berg authored and John W. Linville committed Feb 29, 2008
1 parent 23c7925 commit 7d24628
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b22052569657925d6de33b19b2c7b7562900defb
refs/heads/master: 7d185b8bb17eac9e9d673eb483ded0fbf0b28b97
21 changes: 15 additions & 6 deletions trunk/net/mac80211/tx.c
Original file line number Diff line number Diff line change
Expand Up @@ -1409,10 +1409,17 @@ int ieee80211_subif_start_xmit(struct sk_buff *skb,
goto fail;
}

sta = sta_info_get(local, hdr.addr1);
if (sta) {
sta_flags = sta->flags;
sta_info_put(sta);
/*
* There's no need to try to look up the destination
* if it is a multicast address (which can only happen
* in AP mode)
*/
if (!is_multicast_ether_addr(hdr.addr1)) {
sta = sta_info_get(local, hdr.addr1);
if (sta) {
sta_flags = sta->flags;
sta_info_put(sta);
}
}

/* receiver is QoS enabled, use a QoS type frame */
Expand All @@ -1422,10 +1429,12 @@ int ieee80211_subif_start_xmit(struct sk_buff *skb,
}

/*
* If port access control is enabled, drop frames to unauthorised
* stations unless they are EAPOL frames from the local station.
* If port access control is enabled, drop unicast frames to
* unauthorised stations unless they are EAPOL frames from the
* local station.
*/
if (unlikely(sdata->ieee802_1x_pac &&
!is_multicast_ether_addr(hdr.addr1) &&
!(sta_flags & WLAN_STA_AUTHORIZED) &&
!(ethertype == ETH_P_PAE &&
compare_ether_addr(dev->dev_addr,
Expand Down

0 comments on commit 7d24628

Please sign in to comment.