diff --git a/[refs] b/[refs] index aaa4087a7640..c8e4ec994918 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6674f210e9dbf30e592ccd85b0cf90bd8d1d2d28 +refs/heads/master: f724828bd3db7e0fe6f17ed8de2656bfbfed5c4e diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c index f947ac6bb67c..a29f06c0bcf0 100644 --- a/trunk/net/mac80211/cfg.c +++ b/trunk/net/mac80211/cfg.c @@ -509,7 +509,7 @@ static int ieee80211_set_probe_resp(struct ieee80211_sub_if_data *sdata, if (!resp || !resp_len) return -EINVAL; - old = sdata->u.ap.probe_resp; + old = rtnl_dereference(sdata->u.ap.probe_resp); new = dev_alloc_skb(resp_len); if (!new)