diff options
| author | Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com> | 2011-07-11 17:18:10 +0200 |
|---|---|---|
| committer | Philippe LANGLAIS <philippe.langlais@stericsson.com> | 2011-10-12 13:49:05 +0200 |
| commit | dad01fd59c51d1385303d788d4bf05a024fb082e (patch) | |
| tree | 74ad72e085b55f24933f2c26230e72d23632424d | |
| parent | 65ff576e01f45a0ec7db8db367bec0be32e50206 (diff) | |
cw1200: Aligning mac80211 API with compat-wireless-3.0-rc4-1
Signed-off-by: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com>
Change-Id: I8bf50cd2f97dcb5677b2db8efc89757d74eb3f55
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/27073
Reviewed-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com>
Tested-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33480
Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
| -rw-r--r-- | drivers/staging/cw1200/ap.c | 3 | ||||
| -rw-r--r-- | drivers/staging/cw1200/ap.h | 3 | ||||
| -rw-r--r-- | drivers/staging/cw1200/txrx.c | 8 | ||||
| -rw-r--r-- | drivers/staging/cw1200/txrx.h | 2 |
4 files changed, 9 insertions, 7 deletions
diff --git a/drivers/staging/cw1200/ap.c b/drivers/staging/cw1200/ap.c index f17ce334ed1..b9e91fb07b7 100644 --- a/drivers/staging/cw1200/ap.c +++ b/drivers/staging/cw1200/ap.c @@ -420,7 +420,8 @@ void cw1200_multicast_stop_work(struct work_struct *work) int cw1200_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) { /* Aggregation is implemented fully in firmware, * including block ack negotiation. Do not allow diff --git a/drivers/staging/cw1200/ap.h b/drivers/staging/cw1200/ap.h index 63e6165ed69..59462248bf4 100644 --- a/drivers/staging/cw1200/ap.h +++ b/drivers/staging/cw1200/ap.h @@ -28,7 +28,8 @@ void cw1200_bss_info_changed(struct ieee80211_hw *dev, int cw1200_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); void cw1200_suspend_resume(struct cw1200_common *priv, struct wsm_suspend_resume *arg); diff --git a/drivers/staging/cw1200/txrx.c b/drivers/staging/cw1200/txrx.c index 65a29fef8ff..9b2864c8bde 100644 --- a/drivers/staging/cw1200/txrx.c +++ b/drivers/staging/cw1200/txrx.c @@ -412,7 +412,7 @@ int cw1200_skb_to_wsm(struct cw1200_common *priv, struct sk_buff *skb, /* ******************************************************************** */ -int cw1200_tx(struct ieee80211_hw *dev, struct sk_buff *skb) +void cw1200_tx(struct ieee80211_hw *dev, struct sk_buff *skb) { struct cw1200_common *priv = dev->priv; unsigned queue = skb_get_queue_mapping(skb); @@ -516,16 +516,16 @@ int cw1200_tx(struct ieee80211_hw *dev, struct sk_buff *skb) else goto err; - return NETDEV_TX_OK; + return; err: /* TODO: Update TX failure counters */ dev_kfree_skb_any(skb); - return NETDEV_TX_OK; + return; drop: dev_kfree_skb_any(skb); - return NETDEV_TX_OK; + return; } /* ******************************************************************** */ diff --git a/drivers/staging/cw1200/txrx.h b/drivers/staging/cw1200/txrx.h index 12a9b49028b..12ec3d9808e 100644 --- a/drivers/staging/cw1200/txrx.h +++ b/drivers/staging/cw1200/txrx.h @@ -61,7 +61,7 @@ u32 cw1200_rate_mask_to_wsm(struct cw1200_common *priv, u32 rates); int cw1200_skb_to_wsm(struct cw1200_common *priv, struct sk_buff *skb, struct wsm_tx *wsm); -int cw1200_tx(struct ieee80211_hw *dev, struct sk_buff *skb); +void cw1200_tx(struct ieee80211_hw *dev, struct sk_buff *skb); /* ******************************************************************** */ /* WSM callbacks */ |