--- drivers/net/wireless/rt2x00/rt61pci.c

+++ drivers/net/wireless/rt2x00/rt61pci.c

@@ -2550,7 +2550,6 @@ static int rt61pci_probe_hw_mode(struct

IEEE80211_HW_SIGNAL_DBM |

IEEE80211_HW_SUPPORTS_PS |

IEEE80211_HW_PS_NULLFUNC_STACK;

- rt2x00dev->hw->extra_tx_headroom = 0;

SET_IEEE80211_DEV(rt2x00dev->hw, rt2x00dev->dev);

SET_IEEE80211_PERM_ADDR(rt2x00dev->hw,

@@ -2798,6 +2797,7 @@ static const struct rt2x00_ops rt61pci_o

.eeprom_size = EEPROM_SIZE,

.rf_size = RF_SIZE,

.tx_queues = NUM_TX_QUEUES,

+ .extra_tx_headroom = 0,

.rx = &rt61pci_queue_rx,

.tx = &rt61pci_queue_tx,

.bcn = &rt61pci_queue_bcn,