Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 236198
b: refs/heads/master
c: c0365f0
h: refs/heads/master
v: v3
  • Loading branch information
Javier Martinez Canillas authored and Greg Kroah-Hartman committed Mar 1, 2011
1 parent cb4bb87 commit 2f98029
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 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: f4728c386ce4f57affe6096b8d216bdd899958d6
refs/heads/master: c0365f04f65e2055caefbf0971d4f23969af47ee
6 changes: 4 additions & 2 deletions trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,8 @@ static int wl_ops_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
static int wl_ops_ampdu_action(struct ieee80211_hw *hw,
struct ieee80211_vif *vif,
enum ieee80211_ampdu_mlme_action action,
struct ieee80211_sta *sta, u16 tid, u16 *ssn);
struct ieee80211_sta *sta, u16 tid, u16 *ssn,
u8 buf_size);
static void wl_ops_rfkill_poll(struct ieee80211_hw *hw);

static int wl_ops_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
Expand Down Expand Up @@ -617,7 +618,8 @@ static int
wl_ops_ampdu_action(struct ieee80211_hw *hw,
struct ieee80211_vif *vif,
enum ieee80211_ampdu_mlme_action action,
struct ieee80211_sta *sta, u16 tid, u16 *ssn)
struct ieee80211_sta *sta, u16 tid, u16 *ssn,
u8 buf_size)
{
#if defined(BCMDBG)
struct scb *scb = (struct scb *)sta->drv_priv;
Expand Down

0 comments on commit 2f98029

Please sign in to comment.