From c4f3a85bcf72c2e29d89dad103f11251201971d5 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Thu, 7 Feb 2013 21:30:37 +0100 Subject: [PATCH] --- yaml --- r: 352719 b: refs/heads/master c: 18942d3be0e0e67aa40550ce3266e48b51845d52 h: refs/heads/master i: 352717: ab76f908b1a0f24612b5136be2dfbb50a1be4052 352715: e8ad8d3ebc62b418b517eadaeb7c2d195a68a5c4 352711: 114b03e79c8e5068c195f4433aaa7df431d74a4b 352703: c8bc7658171192511a06df50ead6a4dd31b81bd5 v: v3 --- [refs] | 2 +- trunk/net/mac80211/chan.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b0ab3dc41438..9d5e7282dfb5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cb145022c82bde532b386c7a6f1dcef1b2bca2e5 +refs/heads/master: 18942d3be0e0e67aa40550ce3266e48b51845d52 diff --git a/trunk/net/mac80211/chan.c b/trunk/net/mac80211/chan.c index d91ccfcaa6d1..78dbb371f16e 100644 --- a/trunk/net/mac80211/chan.c +++ b/trunk/net/mac80211/chan.c @@ -9,7 +9,7 @@ #include "ieee80211_i.h" #include "driver-ops.h" -static void ieee80211_change_chandef(struct ieee80211_local *local, +static void ieee80211_change_chanctx(struct ieee80211_local *local, struct ieee80211_chanctx *ctx, const struct cfg80211_chan_def *chandef) { @@ -49,7 +49,7 @@ ieee80211_find_chanctx(struct ieee80211_local *local, if (!compat) continue; - ieee80211_change_chandef(local, ctx, compat); + ieee80211_change_chanctx(local, ctx, compat); return ctx; } @@ -175,7 +175,7 @@ static void ieee80211_recalc_chanctx_chantype(struct ieee80211_local *local, if (WARN_ON_ONCE(!compat)) return; - ieee80211_change_chandef(local, ctx, compat); + ieee80211_change_chanctx(local, ctx, compat); } static void ieee80211_unassign_vif_chanctx(struct ieee80211_sub_if_data *sdata,