Changeset 18431


Ignore:
Timestamp:
2009-11-15T23:05:03+01:00 (7 years ago)
Author:
nbd
Message:

mac80211: adjust patches based on upstream feedback

Location:
trunk/package/mac80211/patches
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/mac80211/patches/520-driver_flags.patch

    r18427 r18431  
    11--- a/include/net/mac80211.h 
    22+++ b/include/net/mac80211.h 
    3 @@ -386,14 +386,17 @@ struct ieee80211_tx_rate { 
    4   * @flags: transmit info flags, defined above 
    5   * @band: the band to transmit on (use for checking for races) 
    6   * @antenna_sel_tx: antenna to use, 0 for automatic diversity 
    7 + * @driver_flags: flags for internal driver use 
    8   * @pad: padding, ignore 
     3@@ -390,10 +390,12 @@ struct ieee80211_tx_rate { 
    94  * @control: union for control data 
    105  * @status: union for status data 
    116  * @driver_data: array of driver_data pointers 
    127- * @ampdu_ack_len: number of aggregated frames. 
    13 - *     relevant only if IEEE80211_TX_STATUS_AMPDU was set. 
    148+ * @ampdu_ack_len: number of acked aggregated frames. 
    15 + *     relevant only if ieee80211_tx_status_ampdu was set. 
     9  *     relevant only if IEEE80211_TX_STATUS_AMPDU was set. 
    1610  * @ampdu_ack_map: block ack bit map for the aggregation. 
    1711  *     relevant only if IEEE80211_TX_STATUS_AMPDU was set. 
    1812+ * @ampdu_len: number of aggregated frames. 
    19 + *     relevant only if ieee80211_tx_status_ampdu was set. 
     13+ *     relevant only if IEEE80211_TX_STATUS_AMPDU was set. 
    2014  * @ack_signal: signal strength of the ACK frame 
    2115  */ 
    2216 struct ieee80211_tx_info { 
    23 @@ -403,8 +406,8 @@ struct ieee80211_tx_info { 
    24   
    25         u8 antenna_sel_tx; 
    26   
    27 -       /* 2 byte hole */ 
    28 -       u8 pad[2]; 
    29 +       u8 driver_flags; 
    30 +       u8 pad; 
    31   
    32         union { 
    33                 struct { 
    34 @@ -428,7 +431,8 @@ struct ieee80211_tx_info { 
     17@@ -428,7 +430,8 @@ struct ieee80211_tx_info { 
    3518                        u8 ampdu_ack_len; 
    3619                        u64 ampdu_ack_map; 
  • trunk/package/mac80211/patches/530-ath9k_cleanup.patch

    r18427 r18431  
    5353  
    5454-       if (tx_info_priv && tx_info_priv->frame_type == ATH9K_INT_PAUSE && 
    55 +       if ((tx_info->driver_flags & ATH_TX_INFO_FRAME_TYPE_PAUSE) && 
     55+       if ((tx_info->pad[0] & ATH_TX_INFO_FRAME_TYPE_PAUSE) && 
    5656            aphy->state == ATH_WIPHY_PAUSING) { 
    5757-               if (!(info->flags & IEEE80211_TX_STAT_ACK)) { 
     
    128128-       tx_info_priv->aphy = aphy; 
    129129-       tx_info_priv->frame_type = txctl->frame_type; 
    130 +       tx_info->driver_flags = 0; 
     130+       tx_info->pad[0] = 0; 
    131131+       switch (txctl->frame_type) { 
    132132+       case ATH9K_NOT_INTERNAL: 
    133133+               break; 
    134134+       case ATH9K_INT_PAUSE: 
    135 +               tx_info->driver_flags |= ATH_TX_INFO_FRAME_TYPE_PAUSE; 
     135+               tx_info->pad[0] |= ATH_TX_INFO_FRAME_TYPE_PAUSE; 
    136136+               /* fall through */ 
    137137+       case ATH9K_INT_UNPAUSE: 
    138 +               tx_info->driver_flags |= ATH_TX_INFO_FRAME_TYPE_INTERNAL; 
     138+               tx_info->pad[0] |= ATH_TX_INFO_FRAME_TYPE_INTERNAL; 
    139139+               break; 
    140140+       } 
     
    195195-               ieee80211_tx_status(hw, skb); 
    196196-       else 
    197 +       if (unlikely(tx_info->driver_flags & ATH_TX_INFO_FRAME_TYPE_INTERNAL)) 
     197+       if (unlikely(tx_info->pad[0] & ATH_TX_INFO_FRAME_TYPE_INTERNAL)) 
    198198                ath9k_tx_status(hw, skb); 
    199199+       else 
     
    227227-       tx_info_priv->update_rc = update_rc; 
    228228+       if (update_rc) 
    229 +               tx_info->driver_flags |= ATH_TX_INFO_UPDATE_RC; 
     229+               tx_info->pad[0] |= ATH_TX_INFO_UPDATE_RC; 
    230230        if (ds->ds_txstat.ts_status & ATH9K_TXERR_FILT) 
    231231                tx_info->flags |= IEEE80211_TX_STAT_TX_FILTERED; 
     
    240240+                       if (ds->ds_txstat.ts_flags & 
    241241+                           (ATH9K_TX_DATA_UNDERRUN | ATH9K_TX_DELIM_UNDERRUN)) 
    242 +                               tx_info->driver_flags |= ATH_TX_INFO_UNDERRUN; 
     242+                               tx_info->pad[0] |= ATH_TX_INFO_UNDERRUN; 
    243243+                       if ((ds->ds_txstat.ts_status & ATH9K_TXERR_XRETRY) || 
    244244+                           (ds->ds_txstat.ts_status & ATH9K_TXERR_FIFO)) 
    245 +                               tx_info->driver_flags |= ATH_TX_INFO_XRETRY; 
     245+                               tx_info->pad[0] |= ATH_TX_INFO_XRETRY; 
    246246+                       tx_info->status.ampdu_len = bf->bf_nframes; 
    247247+                       tx_info->status.ampdu_ack_len = bf->bf_nframes - nbad; 
     
    415415-           !tx_info_priv->update_rc) 
    416416-               goto exit; 
    417 +           !(tx_info->driver_flags & ATH_TX_INFO_UPDATE_RC)) 
     417+           !(tx_info->pad[0] & ATH_TX_INFO_UPDATE_RC)) 
    418418+               return; 
    419419  
     
    432432-           (ATH9K_TX_DATA_UNDERRUN | ATH9K_TX_DELIM_UNDERRUN) && 
    433433-           ((sc->sc_ah->tx_trig_level) >= ath_rc_priv->tx_triglevel_max)) { 
    434 +       if ((tx_info->driver_flags & ATH_TX_INFO_UNDERRUN) && 
     434+       if ((tx_info->pad[0] & ATH_TX_INFO_UNDERRUN) && 
    435435+           (sc->sc_ah->tx_trig_level >= ath_rc_priv->tx_triglevel_max)) { 
    436436                tx_status = 1; 
     
    440440-       if ((tx_info_priv->tx.ts_status & ATH9K_TXERR_XRETRY) || 
    441441-           (tx_info_priv->tx.ts_status & ATH9K_TXERR_FIFO)) 
    442 +       if (tx_info->driver_flags & ATH_TX_INFO_XRETRY) 
     442+       if (tx_info->pad[0] & ATH_TX_INFO_XRETRY) 
    443443                tx_status = 1; 
    444444  
Note: See TracChangeset for help on using the changeset viewer.