rt2x00: Fix compilation for d80211 hwmode API change
Subsystems (3)
PATCH 1/1 rt2x00: Fix compilation for d80211 hwmode API change
This fixes compilation for the d80211 hwmode API change.
Signed-off-by Michael Buesch <[email protected]>
drivers/net/wireless/d80211/rt2x00/rt2400pci.c +32 -31
@@ -590,8 +590,8 @@ static void rt2400pci_config_phymode(strif (rt2x00dev->rx_params.phymode == phymode)return ; - rate = &rt2x00dev->hw->modes[0 ].rates[ - rt2x00dev->hw->modes[0 ].num_rates -1 ]; + rate = &rt2x00dev->hwmodes[0 ].rates[ + rt2x00dev->hwmodes[0 ].num_rates -1 ];rt2400pci_config_rate (rt2x00dev, rate->val2);
@@ -1140,9 +1140,9 @@ static int rt2400pci_init_channel_time(s*/ jiffies_start = jiffies;rt2400pci_config_channel (rt2x00dev, - rt2x00dev->hw->modes[0 ].channels[0 ].val, - rt2x00dev->hw->modes[0 ].channels[0 ].chan, - rt2x00dev->hw->modes[0 ].channels[0 ].freq); + rt2x00dev->hwmodes[0 ].channels[0 ].val, + rt2x00dev->hwmodes[0 ].channels[0 ].chan, + rt2x00dev->hwmodes[0 ].channels[0 ].freq); jiffies_end = jiffies; rt2x00dev->hw->channel_change_time =
@@ -1562,7 +1562,7 @@ static void rt2400pci_rxdone(void *data) size); rt2x00dev->rx_params.rate =device_signal_to_rate ( - &rt2x00dev->hw->modes[0 ], + &rt2x00dev->hwmodes[0 ],rt2x00_get_field32 (word2,RXD_W2_SIGNAL ),0 );
@@ -2579,47 +2579,43 @@ static void rt2400pci_init_hw_rates(strustatic int rt2400pci_init_hw_modes (struct rt2x00_dev *rt2x00dev) { -struct ieee80211_hw *hw = rt2x00dev->hw; -/* * RT2400 only supports 802.11b. * Allocate memory for 14 OFDM channels and 4 CCK rates. */ - hw->num_modes =1 ; - hw->modes = -kzalloc (sizeof (struct ieee80211_hw_modes ),GFP_KERNEL ); -if (!hw->modes) + rt2x00dev->hwmodes = +kzalloc (sizeof (struct ieee80211_hw_mode ),GFP_KERNEL ); +if (!rt2x00dev->hwmodes) goto exit; - hw->modes->num_channels =14 ; - hw->modes->channels = + rt2x00dev->hwmodes[0 ].num_channels =14 ; + rt2x00dev->hwmodes[0 ].channels =kzalloc (sizeof (struct ieee80211_channel ) *14 ,GFP_KERNEL ); -if (!hw->modes->channels) +if (!rt2x00dev->hwmodes[0 ].channels) goto exit_free_modes; - hw->modes->num_rates =4 ; - hw->modes->rates = + rt2x00dev->hwmodes[0 ].num_rates =4 ; + rt2x00dev->hwmodes[0 ].rates =kzalloc (sizeof (struct ieee80211_rate ) *4 ,GFP_KERNEL ); -if (!hw->modes->rates) +if (!rt2x00dev->hwmodes[0 ].rates) goto exit_free_channels;/* * Initialize modes. */ - hw->modes->mode =MODE_IEEE80211B ; + rt2x00dev->hwmodes[0 ].mode =MODE_IEEE80211B ; -rt2400pci_init_hw_channels (rt2x00dev, hw->modes->channels); -rt2400pci_init_hw_rates (rt2x00dev, hw->modes->rates); +rt2400pci_init_hw_channels (rt2x00dev, rt2x00dev->hwmodes[0 ].channels); +rt2400pci_init_hw_rates (rt2x00dev, rt2x00dev->hwmodes[0 ].rates); -return ieee80211_update_hw (hw); +return 0 ; exit_free_channels: -kfree (hw->modes->channels); - hw->modes->channels =NULL ; +kfree (rt2x00dev->hwmodes[0 ].channels); + rt2x00dev->hwmodes[0 ].channels =NULL ; exit_free_modes: -kfree (hw->modes); - hw->modes =NULL ; +kfree (rt2x00dev->hwmodes); exit:ERROR ("Allocation ieee80211 modes failed.\n" );
@@ -2628,6 +2624,7 @@ exit:static int rt2400pci_init_hw (struct rt2x00_dev *rt2x00dev) { +int err;int status;if (GET_FLAG (rt2x00dev,DEVICE_INITIALIZED_HW ))
@@ -2661,6 +2658,11 @@ static int rt2400pci_init_hw(struct rt2xif (ieee80211_register_hw (rt2x00dev->hw))return -EIO ; + err =ieee80211_register_hwmode (rt2x00dev->hw, &rt2x00dev->hwmodes[0 ]); +if (err) { +ieee80211_unregister_hw (rt2x00dev->hw); +return err; + }SET_FLAG (rt2x00dev,DEVICE_INITIALIZED_HW );
@@ -2699,11 +2701,10 @@ static void rt2400pci_free_dev(struct rt/* * Free ieee80211_hw memory. */ -if (likely (rt2x00dev->hw->modes)) { -kfree (rt2x00dev->hw->modes->channels); -kfree (rt2x00dev->hw->modes->rates); -kfree (rt2x00dev->hw->modes); - rt2x00dev->hw->modes =NULL ; +if (likely (rt2x00dev->hwmodes)) { +kfree (rt2x00dev->hwmodes[0 ].channels); +kfree (rt2x00dev->hwmodes[0 ].rates); +kfree (rt2x00dev->hwmodes); } }
drivers/net/wireless/d80211/rt2x00/rt2x00.h +2 -1
@@ -903,6 +903,7 @@ struct rt2x00_dev {* IEEE80211 control structure. */ struct ieee80211_hw *hw; +struct ieee80211_hw_mode *hwmodes;/* * Device flags.
@@ -1161,7 +1162,7 @@ static inline void device_rate_entry(str entry->min_rssi_ack_delta =0 ; } -static inline int device_signal_to_rate (struct ieee80211_hw_modes *mode, +static inline int device_signal_to_rate (struct ieee80211_hw_mode *mode,u8 signal,u8 ofdm) {unsigned int i;
drivers/net/wireless/d80211/rt2x00/rt2500pci.c +55 -48
190 lines not on this page · raw message
drivers/net/wireless/d80211/rt2x00/rt2500usb.c +55 -48
190 lines not on this page · raw message
drivers/net/wireless/d80211/rt2x00/rt61pci.c +55 -48
190 lines not on this page · raw message
drivers/net/wireless/d80211/rt2x00/rt73usb.c +55 -48
190 lines not on this page · raw message
Signature · 1 line
Greetings Michael.
Hi,
Quoted 1 line
This fixes compilation for the d80211 hwmode API change.
I haven't had time yet to look closely at more of the benefits of the new hwmode API change, but this patch looks good.
Thanks!
Quoted 1 line
Signed-off-by Michael Buesch <[email protected]>
Signed-off-by Ivo van Doorn <[email protected]>