Felix Fietkau <[email protected]> writes: > here's my first pull request for 4.21 > > - Felix > > The following changes since commit b72c51a58e6d63ef673ac96b8ab5bc98799c5f7b: > > brcmfmac: Fix out of bounds memory access during fw load (2018-11-29 > 17:33:10 +0200) > > are available in the Git repository at: > > https://github.com/nbd168/wireless tags/mt76-for-kvalo-2018-11-30 > > for you to fetch changes up to e28487ea84a9c081c6d8d7da319427f7fcc32ff5: > > mt76: replace sta_add/remove ops with common sta_state function (2018-11-30 > 12:30:37 +0100) > > ---------------------------------------------------------------- > first batch of mt76 patches for 4.21 > > * use the same firmware for mt76x2e and mt76x2u > * mt76x2 fixes > * mt76x0 fixes > * mt76x0e survey support > * more unification between mt76x2 and mt76x0 > * mt76x0e AP mode support > * mt76x0e DFS support > * rework and fix tx status handling for mt76x0 and mt76x2 > > ----------------------------------------------------------------
I fast forwarded w-d-next to net-next and now there's a conflict. I did a test merge in the pending branch, please double check: https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git/commit/?h=pending&id=e69caab09bf98d0d8b559d06887364cc0090097c This was the conflict: diff --cc drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c index 3f001bd6806c,b54a32397486..000000000000 --- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c @@@ -264,21 -173,6 +173,24 @@@ static int mt76x2_get_antenna(struct ie return 0; } ++<<<<<<< HEAD +static int +mt76x2_set_rts_threshold(struct ieee80211_hw *hw, u32 val) +{ + struct mt76x02_dev *dev = hw->priv; + + if (val != ~0 && val > 0xffff) + return -EINVAL; + + mutex_lock(&dev->mt76.mutex); + mt76x2_mac_set_tx_protection(dev, val); + mutex_unlock(&dev->mt76.mutex); + + return 0; +} + ++======= ++>>>>>>> 1b0adb0ab8649a1ed44f9840724878cffaaa6896 const struct ieee80211_ops mt76x2_ops = { .tx = mt76x02_tx, .start = mt76x2_start, I solved it by removing mt76x2_set_rts_threshold(). After there was also a compilation error which I fixed like this: diff --cc drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c index 3f001bd6806c,b54a32397486..000000000000 --- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c index 3a70e5bf7d42..38bd466cff16 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c @@ -462,9 +462,9 @@ int mt76x02_set_rts_threshold(struct ieee80211_hw *hw, u32 val) if (val != ~0 && val > 0xffff) return -EINVAL; - mutex_lock(&dev->mutex); + mutex_lock(&dev->mt76.mutex); mt76x02_mac_set_tx_protection(dev, val); - mutex_unlock(&dev->mutex); + mutex_unlock(&dev->mt76.mutex); return 0; } -- Kalle Valo
