Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 236769
b: refs/heads/master
c: d7e86c3
h: refs/heads/master
i:
  236767: d89b233
v: v3
  • Loading branch information
Felix Fietkau authored and John W. Linville committed Jan 21, 2011
1 parent 1f11703 commit 9048d88
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 930a7622d618cdf794787938d7cbda5461adb1cb
refs/heads/master: d7e86c3219a1287dd1350a590ee79c8753ff2420
4 changes: 1 addition & 3 deletions trunk/drivers/net/wireless/ath/ath9k/beacon.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 9048d88

Please sign in to comment.