From 3448c4a5998f64b65ac4dfe8aa387e62f350fb88 Mon Sep 17 00:00:00 2001 From: Greg Dietsche Date: Tue, 6 Sep 2011 17:33:51 -0500 Subject: [PATCH] --- yaml --- r: 278207 b: refs/heads/master c: 730b4c2102902a0061bb01a3d3fa1b6461973849 h: refs/heads/master i: 278205: 85536993028aa6b0fd3b2de3167d5a54fa2a88e5 278203: 183c286cf82d2c0118b28b0970cac9a48f6cdf92 278199: 712920e3006357a6bc19eb947ec70e38e906aaf2 278191: 54b2fae0c1c001054fb0412245c7d61fc08f910d 278175: 4788c6e900a0831322fa68142de4f39c116d0f6d 278143: b42e3c2c404bdcfac16b12a5bb0576c839228b71 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlegacy/4965-mac.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6bb6b2afa1a0..e88898019fad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c63b2d01b1bec83f31259651a0ed2a26104cb7a3 +refs/heads/master: 730b4c2102902a0061bb01a3d3fa1b6461973849 diff --git a/trunk/drivers/net/wireless/iwlegacy/4965-mac.c b/trunk/drivers/net/wireless/iwlegacy/4965-mac.c index 8d2f6162d6e8..4aaef4135564 100644 --- a/trunk/drivers/net/wireless/iwlegacy/4965-mac.c +++ b/trunk/drivers/net/wireless/iwlegacy/4965-mac.c @@ -850,8 +850,7 @@ il4965_request_scan(struct il_priv *il, struct ieee80211_vif *vif) lockdep_assert_held(&il->mutex); - if (vif) - ctx = il_rxon_ctx_from_vif(vif); + ctx = il_rxon_ctx_from_vif(vif); if (!il->scan_cmd) { il->scan_cmd =