From 5394986042aa2dc89a152af55eba54d35efc52ad Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Sat, 8 Sep 2012 01:28:42 +0200 Subject: [PATCH] --- yaml --- r: 327941 b: refs/heads/master c: 390fd9d6c223980190adf44af5c7ba0662ff61e3 h: refs/heads/master i: 327939: 2e7ab750bc2f17bfbfca494bceb009be1278a571 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/p54/main.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 85c2e04ae3e8..0efc302783b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 28ab58bd6a80408af79999492c8a28c8910ef62e +refs/heads/master: 390fd9d6c223980190adf44af5c7ba0662ff61e3 diff --git a/trunk/drivers/net/wireless/p54/main.c b/trunk/drivers/net/wireless/p54/main.c index 5e91ad06dd5d..2969d5321ca6 100644 --- a/trunk/drivers/net/wireless/p54/main.c +++ b/trunk/drivers/net/wireless/p54/main.c @@ -139,6 +139,7 @@ static int p54_beacon_format_ie_tim(struct sk_buff *skb) static int p54_beacon_update(struct p54_common *priv, struct ieee80211_vif *vif) { + struct ieee80211_tx_control control = { }; struct sk_buff *beacon; int ret; @@ -158,7 +159,7 @@ static int p54_beacon_update(struct p54_common *priv, * to cancel the old beacon template by hand, instead the firmware * will release the previous one through the feedback mechanism. */ - p54_tx_80211(priv->hw, NULL, beacon); + p54_tx_80211(priv->hw, &control, beacon); priv->tsf_high32 = 0; priv->tsf_low32 = 0;