From 27e67646b9e29d7b66349dbb4ea1eea56c7a77f9 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Sun, 22 Jan 2006 13:57:10 +0200 Subject: [PATCH] --- yaml --- r: 21170 b: refs/heads/master c: 9eafe76b8a5e1420cd6105bc11830914d90bddb4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ieee80211/ieee80211_rx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 76991fdf7afc..6297374ff1f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a73e22b286bd162d10526521b34f2d6f37aac635 +refs/heads/master: 9eafe76b8a5e1420cd6105bc11830914d90bddb4 diff --git a/trunk/net/ieee80211/ieee80211_rx.c b/trunk/net/ieee80211/ieee80211_rx.c index e2f1553ecb7c..c032b82eb56f 100644 --- a/trunk/net/ieee80211/ieee80211_rx.c +++ b/trunk/net/ieee80211/ieee80211_rx.c @@ -574,7 +574,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, /* skb: hdr + (possibly fragmented) plaintext payload */ // PR: FIXME: hostap has additional conditions in the "if" below: // ieee->host_decrypt && (fc & IEEE80211_FCTL_PROTECTED) && - if ((frag != 0 || (fc & IEEE80211_FCTL_MOREFRAGS))) { + if ((frag != 0) || (fc & IEEE80211_FCTL_MOREFRAGS)) { int flen; struct sk_buff *frag_skb = ieee80211_frag_cache_get(ieee, hdr); IEEE80211_DEBUG_FRAG("Rx Fragment received (%u)\n", frag);