diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-08-21 16:00:21 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-08-21 16:00:21 -0400 |
| commit | 01e17dacd47101ad7d33152bbfbbd4394352d2e6 (patch) | |
| tree | d94706b87fcad04d08a46a9b3555396d21ab41ec /drivers/net/wireless/p54/lmac.h | |
| parent | 22c5649eef0fc37532e20c14d2656b28ca708a69 (diff) | |
| parent | dcf33963c48e1959c83fda84e336dbb000eefa3f (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Conflicts:
drivers/net/wireless/mac80211_hwsim.c
Diffstat (limited to 'drivers/net/wireless/p54/lmac.h')
| -rw-r--r-- | drivers/net/wireless/p54/lmac.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/p54/lmac.h b/drivers/net/wireless/p54/lmac.h index 3d8d622bec55..de1d46bf97df 100644 --- a/drivers/net/wireless/p54/lmac.h +++ b/drivers/net/wireless/p54/lmac.h | |||
| @@ -526,7 +526,9 @@ int p54_init_leds(struct p54_common *priv); | |||
| 526 | void p54_unregister_leds(struct p54_common *priv); | 526 | void p54_unregister_leds(struct p54_common *priv); |
| 527 | 527 | ||
| 528 | /* xmit functions */ | 528 | /* xmit functions */ |
| 529 | void p54_tx_80211(struct ieee80211_hw *dev, struct sk_buff *skb); | 529 | void p54_tx_80211(struct ieee80211_hw *dev, |
| 530 | struct ieee80211_tx_control *control, | ||
| 531 | struct sk_buff *skb); | ||
| 530 | int p54_tx_cancel(struct p54_common *priv, __le32 req_id); | 532 | int p54_tx_cancel(struct p54_common *priv, __le32 req_id); |
| 531 | void p54_tx(struct p54_common *priv, struct sk_buff *skb); | 533 | void p54_tx(struct p54_common *priv, struct sk_buff *skb); |
| 532 | 534 | ||