rsi: MAC80211 callbacks and management functions internal to device
PATCH v3 6/10 rsi: MAC80211 callbacks and management functions internal to device
From: Fariya Fatima
This patch has the remaining callbacks from MAC80211 to the driver and functions which prepare management frames internal to the device and also handles exchange of these internal frames with the device.
---
rsi_91x_mac80211.c | 280 ++++++++++++++++++++++++++ rsi_91x_mgmt.c | 561 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 841 insertio
drivers/net/wireless/rsi/rsi_91x_mac80211.c +280 -0
@@ -742,3 +742,283 @@ static int rsi_mac80211_set_rate_mask(streturn 0 ; } +/** +* This function fills rx status in ieee80211_rx_status structure. +* +* @param hw Pointer to the ieee80211_hw structure. +* @param skb Pointer to the socket buffer structure. +* @param common Pointer to the driver private structure. +* @param rxs Pointer to the ieee80211_rx_status structure. +* @return None. +*/ +static void rsi_fill_rx_status (struct ieee80211_hw *hw, +struct sk_buff *skb, +struct rsi_common *common, +struct ieee80211_rx_status *rxs) +{ +struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb); +struct skb_info *rx_params = (struct skb_info *)info->driver_data; +struct ieee80211_hdr *hdr; +char rssi = rx_params->rssi; +u8 hdrlen =0 ; +u8 channel = rx_params->channel; +s32 freq; + + hdr = ((struct ieee80211_hdr *)(skb->data)); + hdrlen =ieee80211_hdrlen (hdr->frame_control); + +memset (info,0 ,sizeof (struct ieee80211_tx_info )); + + rxs->signal = -(rssi); + +if (channel <=14 ) + rxs->band =IEEE80211_BAND_2GHZ ; +else + rxs->band =IEEE80211_BAND_5GHZ ; + + freq =ieee80211_channel_to_frequency (channel, rxs->band); + +if (freq) + rxs->freq = freq; + +if (ieee80211_has_protected (hdr->frame_control)) { +if (rsi_is_cipher_wep (common)) { +memmove (skb->data +4 , skb->data, hdrlen); +skb_pull (skb,4 ); + }else { +memmove (skb->data +8 , skb->data, hdrlen); +skb_pull (skb,8 ); + rxs->flag |=RX_FLAG_MMIC_STRIPPED ; + } + rxs->flag |=RX_FLAG_DECRYPTED ; + rxs->flag |=RX_FLAG_IV_STRIPPED ; + } + +return ; +} + +/** +* This function sends the recieved packet to mac80211. +* +* @param common Pointer to the driver private structure. +* @param skb Pointer to the socket buffer structure. +* @return None. +*/ +void rsi_indicate_pkt_to_os (struct rsi_common *common, +struct sk_buff *skb) +{ +struct rsi_hw *adapter = common->priv; +struct ieee80211_hw *hw = adapter->hw; +struct ieee80211_rx_status *rx_status =IEEE80211_SKB_RXCB (skb); + +if ((common->iface_down) || (!adapter->sc_nvifs)) { +dev_kfree_skb (skb); +return ; + } + +/* filling in the ieee80211_rx_status flags */ +rsi_fill_rx_status (hw, skb, common, rx_status); + +ieee80211_rx_irqsafe (hw, skb); +return ; +} + +static void rsi_set_min_rate (struct ieee80211_hw *hw, +struct ieee80211_sta *sta, +struct rsi_common *common) +{ +u8 band = hw->conf.chandef.chan->band; +u8 ii; +u32 rate_bitmap; +bool matched = false; + + common->bitrate_mask[band] = sta->supp_rates[band]; + + rate_bitmap = (common->fixedrate_mask[band] & sta->supp_rates[band]); + +if (rate_bitmap &0xfff ) { +/* Find out the min rate */ +for (ii =0 ; ii <ARRAY_SIZE (rsi_rates); ii++) { +if (rate_bitmap &BIT (ii)) { + common->min_rate = rsi_rates[ii].hw_value; + matched = true; +break ; + } + } + } + + common->vif_info[0 ].is_ht = sta->ht_cap.ht_supported; + +if ((common->vif_info[0 ].is_ht) && (rate_bitmap >>12 )) { +for (ii =0 ; ii <ARRAY_SIZE (rsi_mcsrates); ii++) { +if ((rate_bitmap >>12 ) &BIT (ii)) { + common->min_rate = rsi_mcsrates[ii]; + matched = true; +break ; + } + } + } + +if (!matched) + common->min_rate =0xffff ; +return ; +} + +/** +* This function notifies driver about a peer getting connected. +* +* @param hw pointer to the ieee80211_hw structure. +* @param vif pointer to the ieee80211_vif structure. +* @param sta pointer to the ieee80211_sta structure. +* @return 0 on success, -1 on failure. +*/ +static int rsi_mac80211_sta_add (struct ieee80211_hw *hw, +struct ieee80211_vif *vif, +struct ieee80211_sta *sta) +{ +struct rsi_hw *adapter = hw->priv; +struct rsi_common *common = adapter->priv; + +if (!sta) +return -1 ; + +mutex_lock (&common->mutex); + +rsi_set_min_rate (hw, sta, common); + +if ((sta->ht_cap.cap &IEEE80211_HT_CAP_SGI_20 ) || + (sta->ht_cap.cap &IEEE80211_HT_CAP_SGI_40 )) { + common->vif_info[0 ].sgi = true; + } + +if (sta->ht_cap.ht_supported) +ieee80211_start_tx_ba_session (sta,0 ,0 ); + +mutex_unlock (&common->mutex); + +return 0 ; +} + +/** +* This function notifies driver about a peer getting disconnected. +* +* @param hw pointer to the ieee80211_hw structure. +* @param vif pointer to the ieee80211_vif structure. +* @param sta pointer to the ieee80211_sta structure. +* @return 0 on success, -1 on failure. +*/ +static int rsi_mac80211_sta_remove (struct ieee80211_hw *hw, +struct ieee80211_vif *vif, +struct ieee80211_sta *sta) +{ +struct rsi_hw *adapter = hw->priv; +struct rsi_common *common = adapter->priv; + +mutex_lock (&common->mutex); +/* Resetting all the fields to default values */ + common->bitrate_mask[IEEE80211_BAND_2GHZ ] =0 ; + common->bitrate_mask[IEEE80211_BAND_5GHZ ] =0 ; + common->min_rate =0xffff ; + common->vif_info[0 ].is_ht = false; + common->vif_info[0 ].sgi = false; + common->vif_info[0 ].seq_start =0 ; + common->secinfo.ptk_cipher =0 ; + common->secinfo.gtk_cipher =0 ; +mutex_unlock (&common->mutex); + +return 0 ; +} + +static struct ieee80211_ops mac80211_ops = { + .tx = rsi_mac80211_tx, + .start = rsi_mac80211_start, + .stop = rsi_mac80211_stop, + .add_interface = rsi_mac80211_add_interface, + .remove_interface = rsi_mac80211_remove_interface, + .config = rsi_mac80211_config, + .bss_info_changed = rsi_mac80211_bss_info_changed, + .conf_tx = rsi_mac80211_conf_tx, + .configure_filter = rsi_mac80211_conf_filter, + .set_key = rsi_mac80211_set_key, + .set_rts_threshold = rsi_mac80211_set_rts_threshold, + .set_bitrate_mask = rsi_mac80211_set_rate_mask, + .ampdu_action = rsi_mac80211_ampdu_action, + .sta_add = rsi_mac80211_sta_add, + .sta_remove = rsi_mac80211_sta_remove, +}; + +/** +* This function is used to initialize Mac80211 stack. +* +* @param common Pointer to the driver private structure. +* @return 0 on success, -1 on failure. +*/ +int rsi_mac80211_attach (struct rsi_common *common) +{ +int status =0 ; +struct ieee80211_hw *hw =NULL ; +struct wiphy *wiphy =NULL ; +struct rsi_hw *adapter = common->priv; +u8 addr_mask[ETH_ALEN ] = {0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x3 }; +struct ieee80211_supported_band *sband = &adapter->sbands[0 ]; + +rsi_dbg (INIT_ZONE ,"%s: Performing mac80211 attach\n" , __func__); + + hw =ieee80211_alloc_hw (sizeof (struct rsi_hw ), &mac80211_ops); +if (!hw) { +rsi_dbg (ERR_ZONE ,"%s: ieee80211 hw alloc failed\n" , __func__); +return -1 ; + } + + wiphy = hw->wiphy; + +SET_IEEE80211_DEV (hw, adapter->device); + + hw->priv = adapter; + adapter->hw = hw; + + hw->flags =IEEE80211_HW_SIGNAL_DBM | +IEEE80211_HW_HAS_RATE_CONTROL | +IEEE80211_HW_AMPDU_AGGREGATION | +0 ; + + hw->queues =MAX_HW_QUEUES ; + hw->extra_tx_headroom =RSI_NEEDED_HEADROOM ; + + hw->max_rates =1 ; + hw->max_rate_tries =MAX_RETRIES ; + + hw->max_tx_aggregation_subframes =6 ; +rsi_register_rates_channels (adapter,IEEE80211_BAND_2GHZ ); +/* rsi_register_rates_channels(adapter, IEEE80211_BAND_5GHZ); */ + hw->rate_control_algorithm ="AARF" ; + +SET_IEEE80211_PERM_ADDR (hw, common->mac_addr); +ether_addr_copy (hw->wiphy->addr_mask, addr_mask); + + wiphy->interface_modes =BIT (NL80211_IFTYPE_STATION ); + wiphy->signal_type =CFG80211_SIGNAL_TYPE_MBM ; + wiphy->retry_short =RETRY_SHORT ; + wiphy->retry_long =RETRY_LONG ; + wiphy->frag_threshold =IEEE80211_MAX_FRAG_THRESHOLD ; + wiphy->rts_threshold =IEEE80211_MAX_RTS_THRESHOLD ; + wiphy->flags =0 ; + + wiphy->available_antennas_rx =1 ; + wiphy->available_antennas_tx =1 ; + wiphy->bands[IEEE80211_BAND_2GHZ ] = &sband[IEEE80211_BAND_2GHZ ]; +/* wiphy->bands[IEEE80211_BAND_5GHZ] = &sband[IEEE80211_BAND_5GHZ]; */ + + status =ieee80211_register_hw (hw); +if (status) +return status; + +#ifdef CONFIG_RSI_DEBUGFS +if (rsi_init_dbgfs (adapter)) { +rsi_dbg (ERR_ZONE ,"%s: dbgfs not created\n" , __func__); +return -1 ; + } +#endif + +return 0 ; +}
drivers/net/wireless/rsi/rsi_91x_mgmt.c +561 -0
561 lines not on this page · raw message
drivers/net/wireless/rsi/rsi_91x_mac80211.c static int rsi_mac80211_set_rate_mask(st · line 963
Quoted 8 lines · Fariya Fatima
drivers/net/wireless/rsi/rsi_91x_mac80211.c +8
-0+int rsi_mac80211_attach (struct rsi_common *common) +{ +int status =0 ; +struct ieee80211_hw *hw =NULL ; +struct wiphy *wiphy =NULL ; +struct rsi_hw *adapter = common->priv; +u8 addr_mask[ETH_ALEN ] = {0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x3 }; +struct ieee80211_supported_band *sband = &adapter->sbands[0 ];
This is pretty odd
drivers/net/wireless/rsi/rsi_91x_mac80211.c static int rsi_mac80211_set_rate_mask(st · line 1009
Quoted 1 line
drivers/net/wireless/rsi/rsi_91x_mac80211.c +1
-0+ wiphy->bands[IEEE80211_BAND_2GHZ ] = &sband[IEEE80211_BAND_2GHZ ];
combined with that.
drivers/net/wireless/rsi/rsi_91x_mac80211.c static int rsi_mac80211_set_rate_mask(st · line 1017
Quoted 8 lines
drivers/net/wireless/rsi/rsi_91x_mac80211.c +8
-0+/* wiphy->bands[IEEE80211_BAND_5GHZ] = &sband[IEEE80211_BAND_5GHZ]; */ + + status =ieee80211_register_hw (hw); +if (status) +return status; + +#ifdef CONFIG_RSI_DEBUGFS +if (rsi_init_dbgfs (adapter)) {
similar comment here like with the teardown.
drivers/net/wireless/rsi/rsi_91x_mac80211.c static int rsi_mac80211_set_rate_mask(st · line 1019
Quoted 2 lines
drivers/net/wireless/rsi/rsi_91x_mac80211.c +2
-0+rsi_dbg (ERR_ZONE ,"%s: dbgfs not created\n" , __func__); +return -1 ;
-1 is also not a good error code, like before
johannes
And that concludes my little review, I can't really comment on USB/SDIO code.
When you resend, please send with a cover letter (man git-send-email) so the thread is held together - I had a hard time finding all your patches again.
johannes