Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 203812
b: refs/heads/master
c: 3be61a3
h: refs/heads/master
v: v3
  • Loading branch information
Johannes Berg authored and John W. Linville committed Jul 26, 2010
1 parent 0289dc5 commit 2350451
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 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: 66c524210ab9217528b01b63c43903545e03a58c
refs/heads/master: 3be61a3851c458fb4ce394645e26e8e9670c796a
4 changes: 3 additions & 1 deletion trunk/net/wireless/ibss.c
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,10 @@ int cfg80211_ibss_wext_join(struct cfg80211_registered_device *rdev,
if (!netif_running(wdev->netdev))
return 0;

if (wdev->wext.keys)
if (wdev->wext.keys) {
wdev->wext.keys->def = wdev->wext.default_key;
wdev->wext.keys->defmgmt = wdev->wext.default_mgmt_key;
}

wdev->wext.ibss.privacy = wdev->wext.default_key != -1;

Expand Down

0 comments on commit 2350451

Please sign in to comment.