madwifi: preserve the interface mode correctly when using wds with sta separation
SVN-Revision: 14195
This commit is contained in:
@@ -315,7 +315,7 @@
|
||||
|
||||
--- a/ath/if_ath.c
|
||||
+++ b/ath/if_ath.c
|
||||
@@ -6577,9 +6577,8 @@ ath_recv_mgmt(struct ieee80211vap * vap,
|
||||
@@ -6578,9 +6578,8 @@ ath_recv_mgmt(struct ieee80211vap * vap,
|
||||
|
||||
sc->sc_recv_mgmt(vap, ni_or_null, skb, subtype, rssi, rtsf);
|
||||
|
||||
@@ -326,7 +326,7 @@
|
||||
(const struct ieee80211_frame_min *)skb->data);
|
||||
if (ni == NULL) {
|
||||
DPRINTF(sc, ATH_DEBUG_BEACON, "Dropping; node unknown.\n");
|
||||
@@ -6734,7 +6733,9 @@ ath_rx_poll(struct net_device *dev, int
|
||||
@@ -6735,7 +6734,9 @@ ath_rx_poll(struct net_device *dev, int
|
||||
struct ath_desc *ds;
|
||||
struct ath_rx_status *rs;
|
||||
struct sk_buff *skb = NULL;
|
||||
@@ -336,7 +336,7 @@
|
||||
unsigned int len;
|
||||
int type;
|
||||
u_int phyerr;
|
||||
@@ -6889,12 +6890,15 @@ rx_accept:
|
||||
@@ -6890,12 +6891,15 @@ rx_accept:
|
||||
skb_trim(skb, skb->len - IEEE80211_CRC_LEN);
|
||||
|
||||
if (mic_fail) {
|
||||
@@ -354,7 +354,7 @@
|
||||
|
||||
if (ni && ni->ni_table) {
|
||||
ieee80211_check_mic(ni, skb);
|
||||
@@ -6956,11 +6960,24 @@ drop_micfail:
|
||||
@@ -6957,11 +6961,24 @@ drop_micfail:
|
||||
* for its use. If the sender is unknown spam the
|
||||
* frame; it'll be dropped where it's not wanted.
|
||||
*/
|
||||
@@ -381,7 +381,7 @@
|
||||
ATH_RSSI_LPF(ATH_NODE(ni)->an_avgrssi, rs->rs_rssi);
|
||||
type = ieee80211_input(ni->ni_vap, ni, skb, rs->rs_rssi, bf->bf_tsf);
|
||||
ieee80211_unref_node(&ni);
|
||||
@@ -6969,24 +6986,35 @@ drop_micfail:
|
||||
@@ -6970,24 +6987,35 @@ drop_micfail:
|
||||
* No key index or no entry, do a lookup and
|
||||
* add the node to the mapping table if possible.
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user