From patchwork Wed Nov 6 18:13:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 3148651 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0E19DBEEB2 for ; Wed, 6 Nov 2013 18:13:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D9A4F2050B for ; Wed, 6 Nov 2013 18:13:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D86EF2050E for ; Wed, 6 Nov 2013 18:13:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755316Ab3KFSNv (ORCPT ); Wed, 6 Nov 2013 13:13:51 -0500 Received: from server19320154104.serverpool.info ([193.201.54.104]:49284 "EHLO hauke-m.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750747Ab3KFSNu (ORCPT ); Wed, 6 Nov 2013 13:13:50 -0500 Received: from localhost (localhost [127.0.0.1]) by hauke-m.de (Postfix) with ESMTP id AD034857F; Wed, 6 Nov 2013 19:13:48 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at hauke-m.de Received: from hauke-m.de ([127.0.0.1]) by localhost (hauke-m.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kw6NiaRhFg9A; Wed, 6 Nov 2013 19:13:44 +0100 (CET) Received: from [IPv6:2001:470:1f0b:447:d56:3d67:959b:8cd5] (unknown [IPv6:2001:470:1f0b:447:d56:3d67:959b:8cd5]) by hauke-m.de (Postfix) with ESMTPSA id 3FA8E8F61; Wed, 6 Nov 2013 19:13:44 +0100 (CET) Message-ID: <527A86D6.1030807@hauke-m.de> Date: Wed, 06 Nov 2013 19:13:42 +0100 From: Hauke Mehrtens User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.1.0 MIME-Version: 1.0 To: Stephen Rothwell CC: stefani@seibold.net, Gabor Juhos , "linux-wireless@vger.kernel.org" , Linux-Next Subject: wrong merge of rt2x00/rt2800pci.c in linux-next X-Enigmail-Version: 1.5.2 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi, I was looking at linux-next-20131106 and the conflict in drivers/net/wireless/rt2x00/rt2800pci.c was solved wrong. The function rt2800pci_txstatus_interrupt() was moved from rt2800pci.c to rt2800mmio_txstatus_interrupt() in rt2800mmio.c in commit 8d03e77218ff4bc59e4645438acbd3c5c7e0f654 , the change done in 3bbfe1d952cd4d2e29bfcb31f109b5d74d1aa847 should be done there. This should be added to the merge 749550cb657ae5fb896b3b33070ae48f37813d13: Hauke break; } --- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/drivers/net/wireless/rt2x00/rt2800mmio.c +++ b/drivers/net/wireless/rt2x00/rt2800mmio.c @@ -446,7 +446,7 @@ static void rt2800mmio_txstatus_interrupt(struct rt2x00_dev *rt2x00dev) if (!rt2x00_get_field32(status, TX_STA_FIFO_VALID)) break; - if (!kfifo_put(&rt2x00dev->txstatus_fifo, &status)) { + if (!kfifo_put(&rt2x00dev->txstatus_fifo, status)) { rt2x00_warn(rt2x00dev, "TX status FIFO overrun, drop tx status report\n");