diff options
Diffstat (limited to 'drivers/net/wireless/p54/p54common.c')
-rw-r--r-- | drivers/net/wireless/p54/p54common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c index 6c175df48b0d..e463c7c3a7e0 100644 --- a/drivers/net/wireless/p54/p54common.c +++ b/drivers/net/wireless/p54/p54common.c | |||
@@ -1532,7 +1532,7 @@ static int p54_tx(struct ieee80211_hw *dev, struct sk_buff *skb) | |||
1532 | queue_delayed_work(dev->workqueue, &priv->work, | 1532 | queue_delayed_work(dev->workqueue, &priv->work, |
1533 | msecs_to_jiffies(P54_TX_FRAME_LIFETIME)); | 1533 | msecs_to_jiffies(P54_TX_FRAME_LIFETIME)); |
1534 | 1534 | ||
1535 | return 0; | 1535 | return NETDEV_TX_OK; |
1536 | 1536 | ||
1537 | err: | 1537 | err: |
1538 | skb_pull(skb, sizeof(*hdr) + sizeof(*txhdr) + padding); | 1538 | skb_pull(skb, sizeof(*hdr) + sizeof(*txhdr) + padding); |
@@ -1774,7 +1774,7 @@ static int p54_set_ps(struct ieee80211_hw *dev) | |||
1774 | int i; | 1774 | int i; |
1775 | 1775 | ||
1776 | if (dev->conf.flags & IEEE80211_CONF_PS) | 1776 | if (dev->conf.flags & IEEE80211_CONF_PS) |
1777 | mode = cpu_to_le16(P54_PSM | P54_PSM_DTIM | P54_PSM_MCBC); | 1777 | mode = P54_PSM | P54_PSM_DTIM | P54_PSM_MCBC; |
1778 | else | 1778 | else |
1779 | mode = P54_PSM_CAM; | 1779 | mode = P54_PSM_CAM; |
1780 | 1780 | ||
@@ -1790,7 +1790,7 @@ static int p54_set_ps(struct ieee80211_hw *dev) | |||
1790 | for (i = 0; i < ARRAY_SIZE(psm->intervals); i++) { | 1790 | for (i = 0; i < ARRAY_SIZE(psm->intervals); i++) { |
1791 | psm->intervals[i].interval = | 1791 | psm->intervals[i].interval = |
1792 | cpu_to_le16(dev->conf.listen_interval); | 1792 | cpu_to_le16(dev->conf.listen_interval); |
1793 | psm->intervals[i].periods = 1; | 1793 | psm->intervals[i].periods = cpu_to_le16(1); |
1794 | } | 1794 | } |
1795 | 1795 | ||
1796 | psm->beacon_rssi_skip_max = 60; | 1796 | psm->beacon_rssi_skip_max = 60; |