Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1402676 > unrolled thread

Re: [GIT] Networking

Started byLinus Torvalds <torvalds@linux-foundation.org>
First post2016-05-18 03:10 +0200
Last post2016-05-19 06:10 +0200
Articles 19 — 8 participants

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  Re: [GIT] Networking Linus Torvalds <torvalds@linux-foundation.org> - 2016-05-18 03:10 +0200
    Re: [GIT] Networking Emmanuel Grumbach <egrumbach@gmail.com> - 2016-05-18 05:40 +0200
      Re: [GIT] Networking "Coelho, Luciano" <luciano.coelho@intel.com> - 2016-05-18 13:00 +0200
        Re: [GIT] Networking Reinoud Koornstra <reinoudkoornstra@gmail.com> - 2016-05-18 14:30 +0200
          Re: [GIT] Networking "Coelho, Luciano" <luciano.coelho@intel.com> - 2016-05-18 14:50 +0200
            Re: [GIT] Networking Reinoud Koornstra <reinoudkoornstra@gmail.com> - 2016-05-18 15:00 +0200
              Re: [GIT] Networking "Coelho, Luciano" <luciano.coelho@intel.com> - 2016-05-18 16:30 +0200
                Re: [GIT] Networking Linus Torvalds <torvalds@linux-foundation.org> - 2016-05-18 20:50 +0200
                  Re: [GIT] Networking Kalle Valo <kvalo@codeaurora.org> - 2016-05-18 21:00 +0200
                    Re: [GIT] Networking Linus Torvalds <torvalds@linux-foundation.org> - 2016-05-18 21:10 +0200
                      Re: [GIT] Networking "Coelho, Luciano" <luciano.coelho@intel.com> - 2016-05-18 21:10 +0200
                      Re: [GIT] Networking Kalle Valo <kvalo@codeaurora.org> - 2016-05-18 21:20 +0200
                  Re: [GIT] Networking Linus Torvalds <torvalds@linux-foundation.org> - 2016-05-18 21:00 +0200
                    Re: [GIT] Networking Reinoud Koornstra <reinoudkoornstra@gmail.com> - 2016-05-19 10:30 +0200
                      Re: [GIT] Networking Reinoud Koornstra <reinoudkoornstra@gmail.com> - 2016-05-19 11:20 +0200
                        Re: [GIT] Networking Sedat Dilek <sedat.dilek@gmail.com> - 2016-05-19 11:50 +0200
                  Re: [GIT] Networking "Coelho, Luciano" <luciano.coelho@intel.com> - 2016-05-18 21:00 +0200
                    [PATCH] iwlwifi: mvm: fix merge damage in tx.c Luca Coelho <luca@coelho.fi> - 2016-05-18 21:40 +0200
                  Re: [GIT] Networking David Miller <davem@davemloft.net> - 2016-05-19 06:10 +0200

#1402676 — Re: [GIT] Networking

FromLinus Torvalds <torvalds@linux-foundation.org>
Date2016-05-18 03:10 +0200
SubjectRe: [GIT] Networking
Message-ID<rzY9Q-3C3-1@gated-at.bofh.it>
On Tue, May 17, 2016 at 12:11 PM, David Miller <davem@davemloft.net> wrote:
>
> Highlights:

Lowlights:

 1) the iwlwifi driver seems to be broken

My laptop that uses the intel 7680 iwlwifi module no longer connects
to the network. It fails with a "Microcode SW error detected." and
spews out register state over and over again.

The last thing it says before falling over is:

  wlp1s0: authenticate with xx:xx:xx:xx:xx:xx
  wlp1s0: send auth to xx:xx:xx:xx:xx:xx (try 1/3)
  wlp1s0: send auth to xx:xx:xx:xx:xx:xx (try 2/3)

and then it goes all titsup.

I thought that it might be because I had downloaded one of the daily
firmware versions (it calls itself iwlwifi-7260-17.ucode, but isn't a
real release afaik - but it has worked fien for me before), but the
problem persists with the ver-16 ucode too, so that wasn't it.

I haven't bisected it, but there is absolutely nothing odd in my hardware.

I do have a 802.11ac network, which apparently not everybody does,
judging by previous bug-reports of mine..

Intel iwlwifi people: please check this out.

               Linus

[toc] | [next] | [standalone]

#1402710

FromEmmanuel Grumbach <egrumbach@gmail.com>
Date2016-05-18 05:40 +0200
Message-ID<rA0uZ-52I-11@gated-at.bofh.it>
In reply to#1402676
On Wed, May 18, 2016 at 4:00 AM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
> On Tue, May 17, 2016 at 12:11 PM, David Miller <davem@davemloft.net> wrote:
>>
>> Highlights:
>
> Lowlights:
>
>  1) the iwlwifi driver seems to be broken
>
> My laptop that uses the intel 7680 iwlwifi module no longer connects
> to the network. It fails with a "Microcode SW error detected." and
> spews out register state over and over again.

Can we have the register state and the ASSERT / NMI / whatever that
goes along with it?
This clearly means that the firmware is crashing, but I don't know why,
I copied here the lines that I need from another bug with another
device with another firmware,
but the log that we will still explain what I need:

[  800.880402] iwlwifi 0000:02:00.0: Start IWL Error Log Dump:
[  800.880406] iwlwifi 0000:02:00.0: Status: 0x00000000, count: 6
[  800.880409] iwlwifi 0000:02:00.0: Loaded firmware version: 21.311951.0
[  800.880413] iwlwifi 0000:02:00.0: 0x00000394 | ADVANCED_SYSASSERT
[  800.880416] iwlwifi 0000:02:00.0: 0x00000220 | trm_hw_status0
[  800.880419] iwlwifi 0000:02:00.0: 0x00000000 | trm_hw_status1
[  800.880422] iwlwifi 0000:02:00.0: 0x00000BD8 | branchlink2
[  800.880425] iwlwifi 0000:02:00.0: 0x00026AC4 | interruptlink1
[  800.880428] iwlwifi 0000:02:00.0: 0x00000000 | interruptlink2
[  800.880431] iwlwifi 0000:02:00.0: 0x00000001 | data1
[  800.880434] iwlwifi 0000:02:00.0: 0x02039845 | data2
[  800.880437] iwlwifi 0000:02:00.0: 0x00000056 | data3
[  800.880440] iwlwifi 0000:02:00.0: 0x8E4184A7 | beacon time
[  800.880443] iwlwifi 0000:02:00.0: 0x30E2CB41 | tsf low
[  800.880446] iwlwifi 0000:02:00.0: 0x00000027 | tsf hi
[  800.880449] iwlwifi 0000:02:00.0: 0x00000000 | time gp1
[  800.880451] iwlwifi 0000:02:00.0: 0x2F842F8A | time gp2
[  800.880454] iwlwifi 0000:02:00.0: 0x00000000 | uCode revision type
[  800.880457] iwlwifi 0000:02:00.0: 0x00000015 | uCode version major
[  800.880460] iwlwifi 0000:02:00.0: 0x0004C28F | uCode version minor
[  800.880463] iwlwifi 0000:02:00.0: 0x00000201 | hw version
[  800.880466] iwlwifi 0000:02:00.0: 0x00489008 | board version
[  800.880469] iwlwifi 0000:02:00.0: 0x0000001C | hcmd
[  800.880472] iwlwifi 0000:02:00.0: 0x24022000 | isr0
[  800.880475] iwlwifi 0000:02:00.0: 0x01000000 | isr1
[  800.880478] iwlwifi 0000:02:00.0: 0x0000580A | isr2
[  800.880481] iwlwifi 0000:02:00.0: 0x4041FCC1 | isr3
[  800.880483] iwlwifi 0000:02:00.0: 0x00000000 | isr4
[  800.880486] iwlwifi 0000:02:00.0: 0x00800110 | last cmd Id
[  800.880489] iwlwifi 0000:02:00.0: 0x00000000 | wait_event
[  800.880492] iwlwifi 0000:02:00.0: 0x000002C8 | l2p_control
[  800.880495] iwlwifi 0000:02:00.0: 0x00018030 | l2p_duration
[  800.880498] iwlwifi 0000:02:00.0: 0x000000BF | l2p_mhvalid
[  800.880501] iwlwifi 0000:02:00.0: 0x000000EF | l2p_addr_match
[  800.880503] iwlwifi 0000:02:00.0: 0x0000000D | lmpm_pmg_sel
[  800.880506] iwlwifi 0000:02:00.0: 0x30031805 | timestamp
[  800.880509] iwlwifi 0000:02:00.0: 0x0000E0F0 | flow_handler




>
> The last thing it says before falling over is:
>
>   wlp1s0: authenticate with xx:xx:xx:xx:xx:xx
>   wlp1s0: send auth to xx:xx:xx:xx:xx:xx (try 1/3)
>   wlp1s0: send auth to xx:xx:xx:xx:xx:xx (try 2/3)
>
> and then it goes all titsup.
>
> I thought that it might be because I had downloaded one of the daily
> firmware versions (it calls itself iwlwifi-7260-17.ucode, but isn't a
> real release afaik - but it has worked fien for me before), but the
> problem persists with the ver-16 ucode too, so that wasn't it.
>
> I haven't bisected it, but there is absolutely nothing odd in my hardware.
>
> I do have a 802.11ac network, which apparently not everybody does,
> judging by previous bug-reports of mine..
>
> Intel iwlwifi people: please check this out.
>
>                Linus
> --
> 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

[toc] | [prev] | [next] | [standalone]

#1402890

From"Coelho, Luciano" <luciano.coelho@intel.com>
Date2016-05-18 13:00 +0200
Message-ID<rA7mO-10d-17@gated-at.bofh.it>
In reply to#1402710
Hi Emmanuel, Linus,


On Wed, 2016-05-18 at 06:37 +0300, Emmanuel Grumbach wrote:
> On Wed, May 18, 2016 at 4:00 AM, Linus Torvalds
> <torvalds@linux-foundation.org> wrote:
> > 
> > On Tue, May 17, 2016 at 12:11 PM, David Miller <davem@davemloft.net
> > > wrote:
> > > 
> > > 
> > > Highlights:
> > Lowlights:
> > 
> >  1) the iwlwifi driver seems to be broken
> > 
> > My laptop that uses the intel 7680 iwlwifi module no longer
> > connects
> > to the network. It fails with a "Microcode SW error detected." and
> > spews out register state over and over again.
> Can we have the register state and the ASSERT / NMI / whatever that
> goes along with it?
> This clearly means that the firmware is crashing, but I don't know
> why,
> I copied here the lines that I need from another bug with another
> device with another firmware,
> but the log that we will still explain what I need:

I managed to reproduce this bug locally with Linus' master.  I'm
investigating the cause and I'll let you how it goes.

--
Cheers,
Luca.

[toc] | [prev] | [next] | [standalone]

#1402924

FromReinoud Koornstra <reinoudkoornstra@gmail.com>
Date2016-05-18 14:30 +0200
Message-ID<rA8LU-25R-21@gated-at.bofh.it>
In reply to#1402890
On Wed, May 18, 2016 at 4:51 AM, Coelho, Luciano
<luciano.coelho@intel.com> wrote:
> Hi Emmanuel, Linus,
>
>
> On Wed, 2016-05-18 at 06:37 +0300, Emmanuel Grumbach wrote:
>> On Wed, May 18, 2016 at 4:00 AM, Linus Torvalds
>> <torvalds@linux-foundation.org> wrote:
>> >
>> > On Tue, May 17, 2016 at 12:11 PM, David Miller <davem@davemloft.net
>> > > wrote:
>> > >
>> > >
>> > > Highlights:
>> > Lowlights:
>> >
>> >  1) the iwlwifi driver seems to be broken
>> >
>> > My laptop that uses the intel 7680 iwlwifi module no longer
>> > connects
>> > to the network. It fails with a "Microcode SW error detected." and
>> > spews out register state over and over again.
>> Can we have the register state and the ASSERT / NMI / whatever that
>> goes along with it?
>> This clearly means that the firmware is crashing, but I don't know
>> why,
>> I copied here the lines that I need from another bug with another
>> device with another firmware,
>> but the log that we will still explain what I need:
>
> I managed to reproduce this bug locally with Linus' master.  I'm
> investigating the cause and I'll let you how it goes.

I did run the latest git code as well 4.6+
iwlwifi went pearshape in my case as well.
I just updated the microcode as well, it didn't matter.
4.6-rc7 works fine and no errors are reported with iwlwifi.

Here's output that might come in handy

[   17.436340] iwlwifi 0000:04:00.0: loaded firmware version
16.242414.0 op_mode iwlmvm
[   17.714920] iwlwifi 0000:04:00.0: Detected Intel(R) Dual Band
Wireless AC 7260, REV=0x144

SNIP
[  114.837923] wlp4s0: authenticate with 00:30:44:1d:cf:2b
[  114.841365] wlp4s0: send auth to 00:30:44:1d:cf:2b (try 1/3)
[  114.842073] wlp4s0: send auth to 00:30:44:1d:cf:2b (try 2/3)
[  115.041992] iwlwifi 0000:04:00.0: Microcode SW error detected.
Restarting 0x2000000.
[  115.041995] iwlwifi 0000:04:00.0: CSR values:
[  115.041996] iwlwifi 0000:04:00.0: (2nd byte of CSR_INT_COALESCING
is CSR_INT_PERIODIC_REG)
[  115.042000] iwlwifi 0000:04:00.0:        CSR_HW_IF_CONFIG_REG: 0X40489204
[  115.042003] iwlwifi 0000:04:00.0:          CSR_INT_COALESCING: 0X80000040
[  115.042006] iwlwifi 0000:04:00.0:                     CSR_INT: 0X00000000
[  115.042009] iwlwifi 0000:04:00.0:                CSR_INT_MASK: 0X00000000
[  115.042013] iwlwifi 0000:04:00.0:           CSR_FH_INT_STATUS: 0X00000000
[  115.042016] iwlwifi 0000:04:00.0:                 CSR_GPIO_IN: 0X00000000
[  115.042019] iwlwifi 0000:04:00.0:                   CSR_RESET: 0X00000000
[  115.042022] iwlwifi 0000:04:00.0:                CSR_GP_CNTRL: 0X080403c5
[  115.042026] iwlwifi 0000:04:00.0:                  CSR_HW_REV: 0X00000144
[  115.042029] iwlwifi 0000:04:00.0:              CSR_EEPROM_REG: 0X00000000
[  115.042032] iwlwifi 0000:04:00.0:               CSR_EEPROM_GP: 0X80000000
[  115.042035] iwlwifi 0000:04:00.0:              CSR_OTP_GP_REG: 0X803a0000
[  115.042038] iwlwifi 0000:04:00.0:                 CSR_GIO_REG: 0X001f0044
[  115.042042] iwlwifi 0000:04:00.0:            CSR_GP_UCODE_REG: 0X00000000
[  115.042045] iwlwifi 0000:04:00.0:           CSR_GP_DRIVER_REG: 0X00000000
[  115.042048] iwlwifi 0000:04:00.0:           CSR_UCODE_DRV_GP1: 0X00000000
[  115.042051] iwlwifi 0000:04:00.0:           CSR_UCODE_DRV_GP2: 0X00000000
[  115.042054] iwlwifi 0000:04:00.0:                 CSR_LED_REG: 0X00000060
[  115.042058] iwlwifi 0000:04:00.0:        CSR_DRAM_INT_TBL_REG: 0X88035a74
[  115.042061] iwlwifi 0000:04:00.0:        CSR_GIO_CHICKEN_BITS: 0X27800200
[  115.042064] iwlwifi 0000:04:00.0:             CSR_ANA_PLL_CFG: 0Xd55555d5
[  115.042067] iwlwifi 0000:04:00.0:      CSR_MONITOR_STATUS_REG: 0X3d0801bd
[  115.042070] iwlwifi 0000:04:00.0:           CSR_HW_REV_WA_REG: 0X0001001a
[  115.042074] iwlwifi 0000:04:00.0:        CSR_DBG_HPET_MEM_REG: 0Xffff0000
[  115.042075] iwlwifi 0000:04:00.0: FH register values:
[  115.042086] iwlwifi 0000:04:00.0:
FH_RSCSR_CHNL0_STTS_WPTR_REG: 0X455fd200
[  115.042097] iwlwifi 0000:04:00.0:
FH_RSCSR_CHNL0_RBDCB_BASE_REG: 0X04556370
[  115.042108] iwlwifi 0000:04:00.0:
FH_RSCSR_CHNL0_WPTR: 0X00000078
[  115.042119] iwlwifi 0000:04:00.0:
FH_MEM_RCSR_CHNL0_CONFIG_REG: 0X00801114
[  115.042129] iwlwifi 0000:04:00.0:
FH_MEM_RSSR_SHARED_CTRL_REG: 0X000000fc
[  115.042140] iwlwifi 0000:04:00.0:
FH_MEM_RSSR_RX_STATUS_REG: 0X03030000
[  115.042151] iwlwifi 0000:04:00.0:
FH_MEM_RSSR_RX_ENABLE_ERR_IRQ2DRV: 0X00000000
[  115.042162] iwlwifi 0000:04:00.0:
FH_TSSR_TX_STATUS_REG: 0X07ff0001
[  115.042173] iwlwifi 0000:04:00.0:
FH_TSSR_TX_ERROR_REG: 0X00000000
[  115.042278] iwlwifi 0000:04:00.0: Start IWL Error Log Dump:
[  115.042279] iwlwifi 0000:04:00.0: Status: 0x00000000, count: 6
[  115.042280] iwlwifi 0000:04:00.0: Loaded firmware version: 16.242414.0
[  115.042281] iwlwifi 0000:04:00.0: 0x00000034 | NMI_INTERRUPT_WDG
[  115.042282] iwlwifi 0000:04:00.0: 0x059002A0 | trm_hw_status0
[  115.042283] iwlwifi 0000:04:00.0: 0x00000000 | trm_hw_status1
[  115.042284] iwlwifi 0000:04:00.0: 0x00000B2C | branchlink2
[  115.042285] iwlwifi 0000:04:00.0: 0x00016A90 | interruptlink1
[  115.042286] iwlwifi 0000:04:00.0: 0x00017E2A | interruptlink2
[  115.042287] iwlwifi 0000:04:00.0: 0x00000000 | data1
[  115.042288] iwlwifi 0000:04:00.0: 0x00000002 | data2
[  115.042289] iwlwifi 0000:04:00.0: 0x07030000 | data3
[  115.042290] iwlwifi 0000:04:00.0: 0xFE86F74B | beacon time
[  115.042291] iwlwifi 0000:04:00.0: 0x0500DB8F | tsf low
[  115.042292] iwlwifi 0000:04:00.0: 0x00000000 | tsf hi
[  115.042293] iwlwifi 0000:04:00.0: 0x0FFCF2CD | time gp1
[  115.042294] iwlwifi 0000:04:00.0: 0x0500DB90 | time gp2
[  115.042295] iwlwifi 0000:04:00.0: 0x00000000 | uCode revision type
[  115.042296] iwlwifi 0000:04:00.0: 0x00000010 | uCode version major
[  115.042297] iwlwifi 0000:04:00.0: 0x0003B2EE | uCode version minor
[  115.042298] iwlwifi 0000:04:00.0: 0x00000144 | hw version
[  115.042299] iwlwifi 0000:04:00.0: 0x40489204 | board version
[  115.042300] iwlwifi 0000:04:00.0: 0x0000001C | hcmd
[  115.042301] iwlwifi 0000:04:00.0: 0xA6EA3808 | isr0
[  115.042302] iwlwifi 0000:04:00.0: 0x10818000 | isr1
[  115.042303] iwlwifi 0000:04:00.0: 0x00000002 | isr2
[  115.042304] iwlwifi 0000:04:00.0: 0x4041FCC7 | isr3
[  115.042305] iwlwifi 0000:04:00.0: 0x00000000 | isr4
[  115.042306] iwlwifi 0000:04:00.0: 0x10810112 | last cmd Id
[  115.042307] iwlwifi 0000:04:00.0: 0x00000000 | wait_event
[  115.042307] iwlwifi 0000:04:00.0: 0x00000050 | l2p_control
[  115.042308] iwlwifi 0000:04:00.0: 0x00018020 | l2p_duration
[  115.042309] iwlwifi 0000:04:00.0: 0x0000003F | l2p_mhvalid
[  115.042310] iwlwifi 0000:04:00.0: 0x00000081 | l2p_addr_match
[  115.042311] iwlwifi 0000:04:00.0: 0x00000005 | lmpm_pmg_sel
[  115.042312] iwlwifi 0000:04:00.0: 0x17111905 | timestamp
[  115.042313] iwlwifi 0000:04:00.0: 0x00347888 | flow_handler
[  115.042316] ieee80211 phy0: Hardware restart was requested
[  115.385259] iwlwifi 0000:04:00.0: L1 Disabled - LTR Enabled
[  115.385483] iwlwifi 0000:04:00.0: L1 Disabled - LTR Enabled
[  115.590186] iwlwifi 0000:04:00.0: L1 Disabled - LTR Enabled
[  115.590424] iwlwifi 0000:04:00.0: L1 Disabled - LTR Enabled
[  115.605968] wlp4s0: send auth to 00:30:44:1d:cf:2b (try 3/3)
[  116.219795] iwlwifi 0000:04:00.0: No association and the time event
is over already...
[  116.219850] wlp4s0: Connection to AP 00:30:44:1d:cf:2b lost
[  116.781404] wlp4s0: authentication with 00:30:44:1d:cf:2b timed out
[  116.793625] iwlwifi 0000:04:00.0: Couldn't drain frames for staid 0
[  116.793631] ------------[ cut here ]------------
[  116.793660] WARNING: CPU: 0 PID: 70 at net/mac80211/sta_info.c:963
__sta_info_destroy_part2+0x1a7/0x1b0 [mac80211]
[  116.793662] Modules linked in: pl2303 usbserial
x86_pkg_temp_thermal intel_powerclamp arc4 snd_hda_codec_hdmi iwlmvm
coretemp mac80211 snd_hda_codec_realtek snd_hda_codec_generic
kvm_intel kvm irqbypass crct10dif_pclmul crc32_pclmul i2c_design
ware_platform ghash_clmulni_intel 8250_dw iwlwifi i2c_designware_core
aesni_intel aes_x86_64 snd_hda_intel lrw snd_hda_codec gf128mul
glue_helper ablk_helper cryptd input_leds snd_hda_core snd_hwdep
cfg80211 serio_raw 8250_fintek snd_pcm snd_seq_
midi snd_seq_midi_event snd_rawmidi snd_seq snd_seq_device snd_timer
shpchp snd mei_me mei soundcore intel_lpss_acpi intel_lpss_pci
intel_lpss acpi_als mac_hid kfifo_buf industrialio acpi_pad parport_pc
ppdev lp parport autofs4 xfs libcrc32c i915
 i2c_algo_bit drm_kms_helper syscopyarea sysfillrect sysimgblt hid_generic
[  116.793714]  fb_sys_fops usbhid mxm_wmi i2c_hid ahci r8169 mii drm
libahci hid wmi pinctrl_sunrisepoint video pinctrl_intel
[  116.793727] CPU: 0 PID: 70 Comm: kworker/u16:1 Tainted: G     U
     4.6.0+ #1
[  116.793730] Hardware name: MSI MS-7971/Z170A PC MATE (MS-7971),
BIOS A.70 01/25/2016
[  116.793755] Workqueue: phy0 ieee80211_iface_work [mac80211]
[  116.793758]  0000000000000286 00000000212b48cb ffff88045a4c7c58
ffffffff813ec315
[  116.793762]  0000000000000000 0000000000000000 ffff88045a4c7c98
ffffffff81081d7b
[  116.793766]  000003c3c0728d9a ffff88042b85a000 ffff880459054720
ffff88045bd4c840
[  116.793770] Call Trace:
[  116.793777]  [<ffffffff813ec315>] dump_stack+0x85/0xc0
[  116.793782]  [<ffffffff81081d7b>] __warn+0xcb/0xf0
[  116.793786]  [<ffffffff81081ead>] warn_slowpath_null+0x1d/0x20
[  116.793807]  [<ffffffffc072dfd7>]
__sta_info_destroy_part2+0x1a7/0x1b0 [mac80211]
[  116.793826]  [<ffffffffc072e00a>] __sta_info_destroy+0x2a/0x40 [mac80211]
[  116.793845]  [<ffffffffc072e058>] sta_info_destroy_addr+0x38/0x60 [mac80211]
[  116.793874]  [<ffffffffc0773227>]
ieee80211_destroy_auth_data+0x37/0xc0 [mac80211]
[  116.793904]  [<ffffffffc077a551>] ieee80211_sta_work+0x511/0x760 [mac80211]
[  116.793927]  [<ffffffffc073d750>] ieee80211_iface_work+0x370/0x410 [mac80211]
[  116.793932]  [<ffffffff810a981b>] ? finish_task_switch+0x7b/0x200
[  116.793937]  [<ffffffff8109c32d>] process_one_work+0x16d/0x480
[  116.793942]  [<ffffffff8109c68b>] worker_thread+0x4b/0x510
[  116.793947]  [<ffffffff8109c640>] ? process_one_work+0x480/0x480
[  116.793951]  [<ffffffff8109c640>] ? process_one_work+0x480/0x480
[  116.793955]  [<ffffffff810a2968>] kthread+0xd8/0xf0
[  116.793961]  [<ffffffff81845d0f>] ret_from_fork+0x1f/0x40
[  116.793964]  [<ffffffff810a2890>] ? kthread_create_on_node+0x1a0/0x1a0
[  116.793967] ---[ end trace 8fa8ad606433a1bc ]---



>
> --
> Cheers,
> Luca.

[toc] | [prev] | [next] | [standalone]

#1402950

From"Coelho, Luciano" <luciano.coelho@intel.com>
Date2016-05-18 14:50 +0200
Message-ID<rA95f-2dr-9@gated-at.bofh.it>
In reply to#1402924
On Wed, 2016-05-18 at 06:20 -0600, Reinoud Koornstra wrote:
> On Wed, May 18, 2016 at 4:51 AM, Coelho, Luciano
> <luciano.coelho@intel.com> wrote:
> > 
> > Hi Emmanuel, Linus,
> > 
> > 
> > On Wed, 2016-05-18 at 06:37 +0300, Emmanuel Grumbach wrote:
> > > 
> > > On Wed, May 18, 2016 at 4:00 AM, Linus Torvalds
> > > <torvalds@linux-foundation.org> wrote:
> > > > 
> > > > 
> > > > On Tue, May 17, 2016 at 12:11 PM, David Miller <davem@davemloft
> > > > .net
> > > > > 
> > > > > wrote:
> > > > > 
> > > > > 
> > > > > Highlights:
> > > > Lowlights:
> > > > 
> > > >  1) the iwlwifi driver seems to be broken
> > > > 
> > > > My laptop that uses the intel 7680 iwlwifi module no longer
> > > > connects
> > > > to the network. It fails with a "Microcode SW error detected."
> > > > and
> > > > spews out register state over and over again.
> > > Can we have the register state and the ASSERT / NMI / whatever
> > > that
> > > goes along with it?
> > > This clearly means that the firmware is crashing, but I don't
> > > know
> > > why,
> > > I copied here the lines that I need from another bug with another
> > > device with another firmware,
> > > but the log that we will still explain what I need:
> > I managed to reproduce this bug locally with Linus' master.  I'm
> > investigating the cause and I'll let you how it goes.
> I did run the latest git code as well 4.6+
> iwlwifi went pearshape in my case as well.
> I just updated the microcode as well, it didn't matter.
> 4.6-rc7 works fine and no errors are reported with iwlwifi.
> 
> Here's output that might come in handy

Thanks! That is helpful.

Since you say that 4.6-rc7 works but 4.6 doesn't, the prime suspect is
commit 5c08b0f5026f ("iwlwifi: mvm: don't override the rate with the
AMSDU len"), which is the only iwlwifi patch between those two
releases.

Could you try to revert that and see if the error is gone?

--
Cheers,
Luca.

[toc] | [prev] | [next] | [standalone]

#1402959

FromReinoud Koornstra <reinoudkoornstra@gmail.com>
Date2016-05-18 15:00 +0200
Message-ID<rA9eW-2gz-9@gated-at.bofh.it>
In reply to#1402950
On Wed, May 18, 2016 at 6:41 AM, Coelho, Luciano
<luciano.coelho@intel.com> wrote:
> On Wed, 2016-05-18 at 06:20 -0600, Reinoud Koornstra wrote:
>> On Wed, May 18, 2016 at 4:51 AM, Coelho, Luciano
>> <luciano.coelho@intel.com> wrote:
>> >
>> > Hi Emmanuel, Linus,
>> >
>> >
>> > On Wed, 2016-05-18 at 06:37 +0300, Emmanuel Grumbach wrote:
>> > >
>> > > On Wed, May 18, 2016 at 4:00 AM, Linus Torvalds
>> > > <torvalds@linux-foundation.org> wrote:
>> > > >
>> > > >
>> > > > On Tue, May 17, 2016 at 12:11 PM, David Miller <davem@davemloft
>> > > > .net
>> > > > >
>> > > > > wrote:
>> > > > >
>> > > > >
>> > > > > Highlights:
>> > > > Lowlights:
>> > > >
>> > > >  1) the iwlwifi driver seems to be broken
>> > > >
>> > > > My laptop that uses the intel 7680 iwlwifi module no longer
>> > > > connects
>> > > > to the network. It fails with a "Microcode SW error detected."
>> > > > and
>> > > > spews out register state over and over again.
>> > > Can we have the register state and the ASSERT / NMI / whatever
>> > > that
>> > > goes along with it?
>> > > This clearly means that the firmware is crashing, but I don't
>> > > know
>> > > why,
>> > > I copied here the lines that I need from another bug with another
>> > > device with another firmware,
>> > > but the log that we will still explain what I need:
>> > I managed to reproduce this bug locally with Linus' master.  I'm
>> > investigating the cause and I'll let you how it goes.
>> I did run the latest git code as well 4.6+
>> iwlwifi went pearshape in my case as well.
>> I just updated the microcode as well, it didn't matter.
>> 4.6-rc7 works fine and no errors are reported with iwlwifi.
>>
>> Here's output that might come in handy
>
> Thanks! That is helpful.
>
> Since you say that 4.6-rc7 works but 4.6 doesn't, the prime suspect is
> commit 5c08b0f5026f ("iwlwifi: mvm: don't override the rate with the
> AMSDU len"), which is the only iwlwifi patch between those two
> releases.
>
> Could you try to revert that and see if the error is gone?

Will do, since git revert failed I'll revert manually and report back.

>
> --
> Cheers,
> Luca.

[toc] | [prev] | [next] | [standalone]

#1403027

From"Coelho, Luciano" <luciano.coelho@intel.com>
Date2016-05-18 16:30 +0200
Message-ID<rAaE1-3i0-13@gated-at.bofh.it>
In reply to#1402959
On Wed, 2016-05-18 at 06:51 -0600, Reinoud Koornstra wrote:
> On Wed, May 18, 2016 at 6:41 AM, Coelho, Luciano
> <luciano.coelho@intel.com> wrote:
> > 
> > On Wed, 2016-05-18 at 06:20 -0600, Reinoud Koornstra wrote:
> > > 
> > > On Wed, May 18, 2016 at 4:51 AM, Coelho, Luciano
> > > <luciano.coelho@intel.com> wrote:
> > > > 
> > > > 
> > > > Hi Emmanuel, Linus,
> > > > 
> > > > 
> > > > On Wed, 2016-05-18 at 06:37 +0300, Emmanuel Grumbach wrote:
> > > > > 
> > > > > 
> > > > > On Wed, May 18, 2016 at 4:00 AM, Linus Torvalds
> > > > > <torvalds@linux-foundation.org> wrote:
> > > > > > 
> > > > > > 
> > > > > > 
> > > > > > On Tue, May 17, 2016 at 12:11 PM, David Miller <davem@davem
> > > > > > loft
> > > > > > .net
> > > > > > > 
> > > > > > > 
> > > > > > > wrote:
> > > > > > > 
> > > > > > > 
> > > > > > > Highlights:
> > > > > > Lowlights:
> > > > > > 
> > > > > >  1) the iwlwifi driver seems to be broken
> > > > > > 
> > > > > > My laptop that uses the intel 7680 iwlwifi module no longer
> > > > > > connects
> > > > > > to the network. It fails with a "Microcode SW error
> > > > > > detected."
> > > > > > and
> > > > > > spews out register state over and over again.
> > > > > Can we have the register state and the ASSERT / NMI /
> > > > > whatever
> > > > > that
> > > > > goes along with it?
> > > > > This clearly means that the firmware is crashing, but I don't
> > > > > know
> > > > > why,
> > > > > I copied here the lines that I need from another bug with
> > > > > another
> > > > > device with another firmware,
> > > > > but the log that we will still explain what I need:
> > > > I managed to reproduce this bug locally with Linus'
> > > > master.  I'm
> > > > investigating the cause and I'll let you how it goes.
> > > I did run the latest git code as well 4.6+
> > > iwlwifi went pearshape in my case as well.
> > > I just updated the microcode as well, it didn't matter.
> > > 4.6-rc7 works fine and no errors are reported with iwlwifi.
> > > 
> > > Here's output that might come in handy
> > Thanks! That is helpful.
> > 
> > Since you say that 4.6-rc7 works but 4.6 doesn't, the prime suspect
> > is
> > commit 5c08b0f5026f ("iwlwifi: mvm: don't override the rate with
> > the
> > AMSDU len"), which is the only iwlwifi patch between those two
> > releases.
> > 
> > Could you try to revert that and see if the error is gone?
> Will do, since git revert failed I'll revert manually and report
> back.

I can confirm that 4.6 contains the same bug.  And reverting the patch
I mentioned does solve the problem...

The same patch works fine in our internal tree.  I'll have to figure
out together with Emmanuel what the problem actually is.

--
Luca.

[toc] | [prev] | [next] | [standalone]

#1403224

FromLinus Torvalds <torvalds@linux-foundation.org>
Date2016-05-18 20:50 +0200
Message-ID<rAeHE-5LI-13@gated-at.bofh.it>
In reply to#1403027
On Wed, May 18, 2016 at 7:23 AM, Coelho, Luciano
<luciano.coelho@intel.com> wrote:
>
> I can confirm that 4.6 contains the same bug.  And reverting the patch
> I mentioned does solve the problem...
>
> The same patch works fine in our internal tree.  I'll have to figure
> out together with Emmanuel what the problem actually is.

Hmm.

From what I can tell, there's a merge bug in commit 909b27f70643,
where David seems to have lost some of the changes to
iwl_mvm_set_tx_cmd().

The reason seems to be a conflict with d8fe484470dd, where David
missed the fact that "info->driver_data[0]" had become
"skb_info->driver_data[0]", and then he removed the skb_info because
it was unused.

I do not know if that's the reason for the problem I see. But I will test.

David, do you happen to recall that merge conflict? I think you must
have removed that "skb_info" variable declaration and initialization
manually (due to the "unused variable" warning, which in turn was due
to the incorrect merge of the actual conflict), because I think git
would have merged that line into the result.

                  Linus

[toc] | [prev] | [next] | [standalone]

#1403226

FromKalle Valo <kvalo@codeaurora.org>
Date2016-05-18 21:00 +0200
Message-ID<rAeRk-5OX-7@gated-at.bofh.it>
In reply to#1403224
"Coelho, Luciano" <luciano.coelho@intel.com> writes:

> Kalle, David, what is the status with the fix that is on the way via
> your trees?

It would be best if you could send a patch either directly to Dave or
Linus to resolve this quickly.

-- 
Kalle Valo

[toc] | [prev] | [next] | [standalone]

#1403232

FromLinus Torvalds <torvalds@linux-foundation.org>
Date2016-05-18 21:10 +0200
Message-ID<rAf0Z-67j-11@gated-at.bofh.it>
In reply to#1403226
On Wed, May 18, 2016 at 11:58 AM, Kalle Valo <kvalo@codeaurora.org> wrote:
>
> It would be best if you could send a patch either directly to Dave or
> Linus to resolve this quickly.

I'm committing my patch myself right now, since this bug makes my
laptop useless, and I will take credit for finding and testing it on
my own even if it was apparently also discussed independently on the
networking list ;)

                Linus

[toc] | [prev] | [next] | [standalone]

#1403233

From"Coelho, Luciano" <luciano.coelho@intel.com>
Date2016-05-18 21:10 +0200
Message-ID<rAf0Z-67j-15@gated-at.bofh.it>
In reply to#1403232
On Wed, 2016-05-18 at 12:00 -0700, Linus Torvalds wrote:
> On Wed, May 18, 2016 at 11:58 AM, Kalle Valo <kvalo@codeaurora.org>
> wrote:
> > 
> > 
> > It would be best if you could send a patch either directly to Dave
> > or
> > Linus to resolve this quickly.
> I'm committing my patch myself right now, since this bug makes my
> laptop useless, and I will take credit for finding and testing it on
> my own even if it was apparently also discussed independently on the
> networking list ;)

Great! :)

You beat me by a few minutes, even though I had the whole day to play
with it. :\

--
Cheers,
Luca.

[toc] | [prev] | [next] | [standalone]

#1403236

FromKalle Valo <kvalo@codeaurora.org>
Date2016-05-18 21:20 +0200
Message-ID<rAfaG-6av-7@gated-at.bofh.it>
In reply to#1403232
Linus Torvalds <torvalds@linux-foundation.org> writes:

> On Wed, May 18, 2016 at 11:58 AM, Kalle Valo <kvalo@codeaurora.org> wrote:
>>
>> It would be best if you could send a patch either directly to Dave or
>> Linus to resolve this quickly.
>
> I'm committing my patch myself right now, since this bug makes my
> laptop useless, and I will take credit for finding and testing it on
> my own

Kiitti :)

> even if it was apparently also discussed independently on the
> networking list ;)

Yeah, sorry about taking this too long.

-- 
Kalle Valo

[toc] | [prev] | [next] | [standalone]

#1403227

FromLinus Torvalds <torvalds@linux-foundation.org>
Date2016-05-18 21:00 +0200
Message-ID<rAeRk-5OX-15@gated-at.bofh.it>
In reply to#1403224

[Multipart message — attachments visible in raw view] — view raw

On Wed, May 18, 2016 at 11:45 AM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>
> From what I can tell, there's a merge bug in commit 909b27f70643,
> where David seems to have lost some of the changes to
> iwl_mvm_set_tx_cmd().
>
> I do not know if that's the reason for the problem I see. But I will test.

Yes. The attached patch that fixes the incorrect merge seems to fix
things for me.

That should mean that the assumption that this problem existed in v4.6
too was wrong, because the incorrect merge came in later. I think
Luciano mis-understood "v4.6+" to mean plain v4.6.

Reinoud Koornstra, does this patch fix things for you too?

                       Linus

[toc] | [prev] | [next] | [standalone]

#1403497

FromReinoud Koornstra <reinoudkoornstra@gmail.com>
Date2016-05-19 10:30 +0200
Message-ID<rArvc-5HV-17@gated-at.bofh.it>
In reply to#1403227
On Wed, May 18, 2016 at 12:51 PM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
> On Wed, May 18, 2016 at 11:45 AM, Linus Torvalds
> <torvalds@linux-foundation.org> wrote:
>>
>> From what I can tell, there's a merge bug in commit 909b27f70643,
>> where David seems to have lost some of the changes to
>> iwl_mvm_set_tx_cmd().
>>
>> I do not know if that's the reason for the problem I see. But I will test.
>
> Yes. The attached patch that fixes the incorrect merge seems to fix
> things for me.
>
> That should mean that the assumption that this problem existed in v4.6
> too was wrong, because the incorrect merge came in later. I think
> Luciano mis-understood "v4.6+" to mean plain v4.6.
>
> Reinoud Koornstra, does this patch fix things for you too?

Indeed, I meant 4.6+, not 4.6.
The patch you attached doesn't change existing code for me in 4.6+ as
these two lines are already in there.
Thanks,

Reinoud.

>
>                        Linus

[toc] | [prev] | [next] | [standalone]

#1403533

FromReinoud Koornstra <reinoudkoornstra@gmail.com>
Date2016-05-19 11:20 +0200
Message-ID<rAshz-6ee-15@gated-at.bofh.it>
In reply to#1403497

[Multipart message — attachments visible in raw view] — view raw

On Thu, May 19, 2016 at 2:20 AM, Reinoud Koornstra
<reinoudkoornstra@gmail.com> wrote:
> On Wed, May 18, 2016 at 12:51 PM, Linus Torvalds
> <torvalds@linux-foundation.org> wrote:
>> On Wed, May 18, 2016 at 11:45 AM, Linus Torvalds
>> <torvalds@linux-foundation.org> wrote:
>>>
>>> From what I can tell, there's a merge bug in commit 909b27f70643,
>>> where David seems to have lost some of the changes to
>>> iwl_mvm_set_tx_cmd().
>>>
>>> I do not know if that's the reason for the problem I see. But I will test.
>>
>> Yes. The attached patch that fixes the incorrect merge seems to fix
>> things for me.
>>
>> That should mean that the assumption that this problem existed in v4.6
>> too was wrong, because the incorrect merge came in later. I think
>> Luciano mis-understood "v4.6+" to mean plain v4.6.
>>
>> Reinoud Koornstra, does this patch fix things for you too?
>
> Indeed, I meant 4.6+, not 4.6.
> The patch you attached doesn't change existing code for me in 4.6+ as
> these two lines are already in there.
> Thanks,
>
> Reinoud.
>

In the 4.6+ code from today I reverted commit 5c08b0f5026f.
Now iwlwifi works fine for me again.
So it's as the Intel guys suspected.
I'll attached my revert compared to the current 4.6+ development code.
Thanks,

Reinoud.



>>
>>                        Linus

[toc] | [prev] | [next] | [standalone]

#1403606

FromSedat Dilek <sedat.dilek@gmail.com>
Date2016-05-19 11:50 +0200
Message-ID<rAsKB-6pH-3@gated-at.bofh.it>
In reply to#1403533
On 5/19/16, Reinoud Koornstra <reinoudkoornstra@gmail.com> wrote:
> On Thu, May 19, 2016 at 2:20 AM, Reinoud Koornstra
> <reinoudkoornstra@gmail.com> wrote:
>> On Wed, May 18, 2016 at 12:51 PM, Linus Torvalds
>> <torvalds@linux-foundation.org> wrote:
>>> On Wed, May 18, 2016 at 11:45 AM, Linus Torvalds
>>> <torvalds@linux-foundation.org> wrote:
>>>>
>>>> From what I can tell, there's a merge bug in commit 909b27f70643,
>>>> where David seems to have lost some of the changes to
>>>> iwl_mvm_set_tx_cmd().
>>>>
>>>> I do not know if that's the reason for the problem I see. But I will
>>>> test.
>>>
>>> Yes. The attached patch that fixes the incorrect merge seems to fix
>>> things for me.
>>>
>>> That should mean that the assumption that this problem existed in v4.6
>>> too was wrong, because the incorrect merge came in later. I think
>>> Luciano mis-understood "v4.6+" to mean plain v4.6.
>>>
>>> Reinoud Koornstra, does this patch fix things for you too?
>>
>> Indeed, I meant 4.6+, not 4.6.
>> The patch you attached doesn't change existing code for me in 4.6+ as
>> these two lines are already in there.
>> Thanks,
>>
>> Reinoud.
>>
>
> In the 4.6+ code from today I reverted commit 5c08b0f5026f.
> Now iwlwifi works fine for me again.
> So it's as the Intel guys suspected.
> I'll attached my revert compared to the current 4.6+ development code.
> Thanks,
>

I am not affected by any of these iwlwifi issues.

Can you next time add the commit-subject together with the commit-id,
like this...

commit 5c08b0f5026fcc13efb947c4d1f2ca3558145f68
"iwlwifi: mvm: don't override the rate with the AMSDU len"

...it's easier for followers of this thread.

- Sedat -

[1] http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=5c08b0f5026fcc13efb947c4d1f2ca3558145f68

[toc] | [prev] | [next] | [standalone]

#1403228

From"Coelho, Luciano" <luciano.coelho@intel.com>
Date2016-05-18 21:00 +0200
Message-ID<rAeRk-5OX-9@gated-at.bofh.it>
In reply to#1403224
On Wed, 2016-05-18 at 11:45 -0700, Linus Torvalds wrote:
> On Wed, May 18, 2016 at 7:23 AM, Coelho, Luciano
> <luciano.coelho@intel.com> wrote:
> > 
> > 
> > I can confirm that 4.6 contains the same bug.  And reverting the
> > patch
> > I mentioned does solve the problem...
> > 
> > The same patch works fine in our internal tree.  I'll have to
> > figure
> > out together with Emmanuel what the problem actually is.
> Hmm.
> 
> From what I can tell, there's a merge bug in commit 909b27f70643,
> where David seems to have lost some of the changes to
> iwl_mvm_set_tx_cmd().
> 
> The reason seems to be a conflict with d8fe484470dd, where David
> missed the fact that "info->driver_data[0]" had become
> "skb_info->driver_data[0]", and then he removed the skb_info because
> it was unused.
> 
> I do not know if that's the reason for the problem I see. But I will
> test.
> 
> David, do you happen to recall that merge conflict? I think you must
> have removed that "skb_info" variable declaration and initialization
> manually (due to the "unused variable" warning, which in turn was due
> to the incorrect merge of the actual conflict), because I think git
> would have merged that line into the result.

Actually I just tested it and indeed it seems to be the merge damage
(which we discussed extensively in the linux-wireless mailing list)
that causes this problem.  The "4.6 doesn't work either" thing was a
false alarm.

If the merge damage is fixed this way, the problem is gone:

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
index b5f7c36..ae2ecf6 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
@@ -211,6 +211,7 @@ void iwl_mvm_set_tx_cmd(struct iwl_mvm *mvm, struct
sk_buff *skb,
                        struct iwl_tx_cmd *tx_cmd,
                        struct ieee80211_tx_info *info, u8 sta_id)
 {
+       struct ieee80211_tx_info *skb_info = IEEE80211_SKB_CB(skb);
        struct ieee80211_hdr *hdr = (void *)skb->data;
        __le16 fc = hdr->frame_control;
        u32 tx_flags = le32_to_cpu(tx_cmd->tx_flags);
@@ -294,7 +295,7 @@ void iwl_mvm_set_tx_cmd(struct iwl_mvm *mvm, struct
sk_buff *skb,
        tx_cmd->tx_flags = cpu_to_le32(tx_flags);
        /* Total # bytes to be transmitted */
        tx_cmd->len = cpu_to_le16((u16)skb->len +
-               (uintptr_t)info->driver_data[0]);
+               (uintptr_t)skb_info->driver_data[0]);
        tx_cmd->life_time = cpu_to_le32(TX_CMD_LIFE_TIME_INFINITE);
        tx_cmd->sta_id = sta_id;


Kalle, David, what is the status with the fix that is on the way via
your trees?

--
Cheers,
Luca.

[toc] | [prev] | [next] | [standalone]

#1403249 — [PATCH] iwlwifi: mvm: fix merge damage in tx.c

FromLuca Coelho <luca@coelho.fi>
Date2016-05-18 21:40 +0200
Subject[PATCH] iwlwifi: mvm: fix merge damage in tx.c
Message-ID<rAfu1-6iT-5@gated-at.bofh.it>
In reply to#1403228
From: Luca Coelho <luciano.coelho@intel.com>

During the merge in commit 909b27f70643 ("Merge
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net"), there was a
small merge damage where one instance of info was not converted into
skb_info.  Fix this.

Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
 drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
index 8802109..c53aa0f 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
@@ -211,6 +211,7 @@ void iwl_mvm_set_tx_cmd(struct iwl_mvm *mvm, struct sk_buff *skb,
 			struct iwl_tx_cmd *tx_cmd,
 			struct ieee80211_tx_info *info, u8 sta_id)
 {
+	struct ieee80211_tx_info *skb_info = IEEE80211_SKB_CB(skb);
 	struct ieee80211_hdr *hdr = (void *)skb->data;
 	__le16 fc = hdr->frame_control;
 	u32 tx_flags = le32_to_cpu(tx_cmd->tx_flags);
@@ -294,7 +295,7 @@ void iwl_mvm_set_tx_cmd(struct iwl_mvm *mvm, struct sk_buff *skb,
 	tx_cmd->tx_flags = cpu_to_le32(tx_flags);
 	/* Total # bytes to be transmitted */
 	tx_cmd->len = cpu_to_le16((u16)skb->len +
-		(uintptr_t)info->driver_data[0]);
+		(uintptr_t)skb_info->driver_data[0]);
 	tx_cmd->life_time = cpu_to_le32(TX_CMD_LIFE_TIME_INFINITE);
 	tx_cmd->sta_id = sta_id;
 
-- 
2.8.1

[toc] | [prev] | [next] | [standalone]

#1403424

FromDavid Miller <davem@davemloft.net>
Date2016-05-19 06:10 +0200
Message-ID<rAnrA-3bW-9@gated-at.bofh.it>
In reply to#1403224
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 May 2016 11:45:06 -0700

> David, do you happen to recall that merge conflict? I think you must
> have removed that "skb_info" variable declaration and initialization
> manually (due to the "unused variable" warning, which in turn was due
> to the incorrect merge of the actual conflict), because I think git
> would have merged that line into the result.

Yes, I know I buggered this merge conflict and Kalle said he'd have
a fix coming my way ASAP.

Sorry, I was travelling today, so I'll catch up with this tomorrow.

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web