From d34958a9bdf6726ee3dead746847c8e36162f51b Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Mon, 8 Oct 2012 08:42:58 +0800 Subject: [PATCH] --- yaml --- r: 333995 b: refs/heads/master c: 9c371f997353385dfa2f7a8004ce13397e071a25 h: refs/heads/master i: 333993: 023ffd7b588246709f7c3bfc1835ff9e0dc8fbf8 333991: 2d91e85da7c1694b27fa0101bcad8cde804fee1c v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath5k/base.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0fdcfe17d6e1..d730ef88cb73 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8cc1d52390f53c6dd46ae71e29ea000634a17e3a +refs/heads/master: 9c371f997353385dfa2f7a8004ce13397e071a25 diff --git a/trunk/drivers/net/wireless/ath/ath5k/base.c b/trunk/drivers/net/wireless/ath/ath5k/base.c index 9fd6d9a9942e..9f31cfa56cc0 100644 --- a/trunk/drivers/net/wireless/ath/ath5k/base.c +++ b/trunk/drivers/net/wireless/ath/ath5k/base.c @@ -1804,7 +1804,7 @@ ath5k_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif) { int ret; struct ath5k_hw *ah = hw->priv; - struct ath5k_vif *avf = (void *)vif->drv_priv; + struct ath5k_vif *avf; struct sk_buff *skb; if (WARN_ON(!vif)) { @@ -1819,6 +1819,7 @@ ath5k_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif) goto out; } + avf = (void *)vif->drv_priv; ath5k_txbuf_free_skb(ah, avf->bbuf); avf->bbuf->skb = skb; ret = ath5k_beacon_setup(ah, avf->bbuf);