chromeos/compat-wireless/net/mac80211/rx.c - Issue 5326002: Update compat-wireless to 2.6.36-5-spn

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chromeos/compat-wireless/net/mac80211/rx.c

Issue 5326002: Update compat-wireless to 2.6.36-5-spn (Closed) Base URL: http://git.chromium.org/git/kernel.git@master

Patch Set: Created 10 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chromeos/compat-wireless/net/mac80211/rx.c

diff --git a/chromeos/compat-wireless/net/mac80211/rx.c b/chromeos/compat-wireless/net/mac80211/rx.c

index 8182237d542a278055070f3b910fbe04bff08cdd..fa7b76066000837d4313a0701a0ff9dfda209093 100644

--- a/chromeos/compat-wireless/net/mac80211/rx.c

+++ b/chromeos/compat-wireless/net/mac80211/rx.c

@@ -2199,9 +2199,6 @@ static void ieee80211_rx_cooked_monitor(struct ieee80211_rx_data *rx,

struct net_device *prev_dev = NULL;

struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);

- if (status->flag & RX_FLAG_INTERNAL_CMTR)

- goto out_free_skb;

if (skb_headroom(skb) < sizeof(*rthdr) &&

pskb_expand_head(skb, sizeof(*rthdr), 0, GFP_ATOMIC))

goto out_free_skb;

@@ -2260,7 +2257,6 @@ static void ieee80211_rx_cooked_monitor(struct ieee80211_rx_data *rx,

} else

goto out_free_skb;

- status->flag |= RX_FLAG_INTERNAL_CMTR;

return;

out_free_skb: