From 9048d8850245aa6110c174af7ae262f4b3021a9c Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 20 Jan 2011 21:57:30 +0100 Subject: [PATCH] --- yaml --- r: 236769 b: refs/heads/master c: d7e86c3219a1287dd1350a590ee79c8753ff2420 h: refs/heads/master i: 236767: d89b2330ec6ed0fe8ac2b5fb3c6b394137e0c5c2 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath9k/beacon.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ca1422a90c5a..bfdfe558bfd0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 930a7622d618cdf794787938d7cbda5461adb1cb +refs/heads/master: d7e86c3219a1287dd1350a590ee79c8753ff2420 diff --git a/trunk/drivers/net/wireless/ath/ath9k/beacon.c b/trunk/drivers/net/wireless/ath/ath9k/beacon.c index 8de591e5b851..ab8c05cf62f3 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/beacon.c +++ b/trunk/drivers/net/wireless/ath/ath9k/beacon.c @@ -279,10 +279,8 @@ int ath_beacon_alloc(struct ath_wiphy *aphy, struct ieee80211_vif *vif) /* NB: the beacon data buffer must be 32-bit aligned. */ skb = ieee80211_beacon_get(sc->hw, vif); - if (skb == NULL) { - ath_err(common, "ieee80211_beacon_get failed\n"); + if (skb == NULL) return -ENOMEM; - } tstamp = ((struct ieee80211_mgmt *)skb->data)->u.beacon.timestamp; sc->beacon.bc_tstamp = le64_to_cpu(tstamp);