projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
[linux-2.6-block.git]
/
net
/
mac80211
/
ocb.c
diff --git
a/net/mac80211/ocb.c
b/net/mac80211/ocb.c
index 358d5f9d820788acef2f439dee6ac88250724edc..573b81a1fb2d882487f75ccc24493cc1b9deee5e 100644
(file)
--- a/
net/mac80211/ocb.c
+++ b/
net/mac80211/ocb.c
@@
-179,7
+179,7
@@
int ieee80211_ocb_join(struct ieee80211_sub_if_data *sdata,
{
struct ieee80211_local *local = sdata->local;
struct ieee80211_if_ocb *ifocb = &sdata->u.ocb;
- u32 changed = BSS_CHANGED_OCB;
+ u32 changed = BSS_CHANGED_OCB
| BSS_CHANGED_BSSID
;
int err;
if (ifocb->joined == true)