chromeos/compat-wireless/net/wireless/scan.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/wireless/scan.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: Fixes for !ACK handling, missing local changes, log message fixes Created 10 years 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/wireless/scan.c

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

index e4ed81d09a7ee1e419612e1ecc66e48f544b53ab..832276416eaeb9ae2c4a0960a407adcac001ddd6 100644

--- a/chromeos/compat-wireless/net/wireless/scan.c

+++ b/chromeos/compat-wireless/net/wireless/scan.c

@@ -660,14 +660,14 @@ void cfg80211_unlink_bss(struct wiphy *wiphy, struct cfg80211_bss *pub)

bss = container_of(pub, struct cfg80211_internal_bss, pub);

spin_lock_bh(&dev->bss_lock);

+ if (!list_empty(&bss->list)) {

+ list_del_init(&bss->list);

+ dev->bss_generation++;

+ rb_erase(&bss->rbn, &dev->bss_tree);

- list_del(&bss->list);

- dev->bss_generation++;

- rb_erase(&bss->rbn, &dev->bss_tree);

+ kref_put(&bss->ref, bss_release);

+ }

spin_unlock_bh(&dev->bss_lock);

- kref_put(&bss->ref, bss_release);

}

EXPORT_SYMBOL(cfg80211_unlink_bss);