26 Oct, 2012

4 commits

  • If a failure takes place during the EQ creation, we need to unmap the
    UAR memory block too.

    Signed-off-by: Dotan Barak
    Signed-off-by: Uri Habusha
    Signed-off-by: Or Gerlitz
    Signed-off-by: David S. Miller

    Dotan Barak
     
  • The vlan tag can be zero. This is why it can't serve as an indication
    that packet requires VLAN header in the TX flow.

    Signed-off-by: Moni Shoua
    Signed-off-by: Or Gerlitz
    Signed-off-by: David S. Miller

    Moni Shoua
     
  • The QP range is reserved as a single block. However, when freeing the
    en resources, the tx-ring QPs are released both in mlx4_en_destroy_tx_ring
    (one at a time) and in mlx4_en_free_resources (as a block release).

    Fix by eliminating the one-at-a-time release in mlx4_en_destroy_tx_ring.

    Signed-off-by: Jack Morgenstein
    Signed-off-by: Or Gerlitz
    Signed-off-by: David S. Miller

    Jack Morgenstein
     
  • The delayed work function int_in_work() may call usb_reset_device()
    and thus, indirectly, the driver's pre_reset method. Trying to
    cancel the work synchronously in that situation would deadlock.
    Fix by avoiding cancel_work_sync() in the pre_reset method.

    If the reset was NOT initiated by int_in_work() this might cause
    int_in_work() to run after the post_reset method, with urb_int_in
    already resubmitted, so handle that case gracefully.

    Signed-off-by: Tilman Schmidt
    Signed-off-by: David S. Miller

    Tilman Schmidt
     

25 Oct, 2012

6 commits

  • We copy head count to a 16 bit field, this works by chance on LE but on
    BE guest gets 0. Fix it up.

    Signed-off-by: Michael S. Tsirkin
    Tested-by: Alexander Graf
    Cc: stable@vger.kernel.org
    Signed-off-by: David S. Miller

    Michael S. Tsirkin
     
  • When using a 36 bit dtb file, the driver complains "resource busy".

    Investigating the source of the message leads one to the
    gianfar_ptp_probe function.

    Since the type of the device resource requested in this function
    is IORESOURCE_MEM, it should use "iomem_resource" instead of
    "ioports_resource".

    Signed-off-by: Wei Yang
    Cc: Claudiu Manoil
    Cc: Timur Tabi
    Signed-off-by: Paul Gortmaker
    Signed-off-by: David S. Miller

    Wei Yang
     
  • Marc Kleine-Budde says:

    ====================
    here are two patches for the v3.7 release cycle. A patch by Wolfgang Grandegger
    for the flexcan driver, which switches off a workaround on the imx6q that is
    not needed, because the hardware is not affected by that bug. And a patch by
    Stephane Grosjean which updates the pci device table for the peak pci sja1000
    ====================

    Signed-off-by: David S. Miller

    David S. Miller
     
  • Commit a02e4b7dae4551(Demark default hoplimit as zero) only changes the
    hoplimit checking condition and default value in ip6_dst_hoplimit, not
    zeros all hoplimit default value.

    Keep the zeroing ip6_template_metrics[RTAX_HOPLIMIT - 1] to force it as
    const, cause as a37e6e344910(net: force dst_default_metrics to const
    section)

    Signed-off-by: Li RongQing
    Signed-off-by: David S. Miller

    Li RongQing
     
  • The cpsw/davinci mdio ip cores are present on am33xx, so make NET_VENDOR_TI
    visible for it as well.

    Signed-off-by: Peter Korsgaard
    Signed-off-by: David S. Miller

    Peter Korsgaard
     
  • If we fail to allocate rx buffers pool by any reason, we'll just return
    with an error, however we've previously successfully requested an irq. Fix
    this by releasing the irq before returning the error.

    Signed-off-by: Veaceslav Falico
    Signed-off-by: David S. Miller

    Veaceslav Falico
     

24 Oct, 2012

2 commits

  • This patch adds the support for 4 new PCI boards based on the SJA1000 CAN
    controller, from PEAK-System Technik:

    . PCAN-miniPCIe (PCI-Express Mini slots, available as single or dual-channel)
    . PCAN-cPCI (CompactPCI format, available as single or dual-channel)
    . PCAN-PC/104-Plus (PC/104-Plus system, av. as 1, 2 or 4 channels)
    . PCAN-PCI/104-Express (PCI/104-Express system, av. as 1 or 2 channels)

    This patch also fixes a typo in existing "PEAK_MPCI_DEVICE_ID" identifier
    (missing "e" for Express). Finally, it also changes the author as well as it
    updates the module supported devices list.

    Signed-off-by: Stephane Grosjean
    Acked-by: Oliver Hartkopp
    Acked-by: Wolfgang Grandegger
    Signed-off-by: Marc Kleine-Budde

    Stephane Grosjean
     
  • This patch adds some Flexcan version info and removes the feature flag
    FLEXCAN_HAS_BROKEN_ERR_STATE for the i.MX6Q. It also has the line [TR]WRN_INT
    properly connected.

    Cc: Hui Wang
    Cc: Shawn Guo
    Signed-off-by: Wolfgang Grandegger
    [mkl: convert to incremental patch]
    Signed-off-by: Marc Kleine-Budde

    Wolfgang Grandegger
     

23 Oct, 2012

8 commits

  • A packet with an invalid ack_seq may cause a TCP Fast Open socket to switch
    to the unexpected TCP_CLOSING state, triggering a BUG_ON kernel panic.

    When a FIN packet with an invalid ack_seq# arrives at a socket in
    the TCP_FIN_WAIT1 state, rather than discarding the packet, the current
    code will accept the FIN, causing state transition to TCP_CLOSING.

    This may be a small deviation from RFC793, which seems to say that the
    packet should be dropped. Unfortunately I did not expect this case for
    Fast Open hence it will trigger a BUG_ON panic.

    It turns out there is really nothing bad about a TFO socket going into
    TCP_CLOSING state so I could just remove the BUG_ON statements. But after
    some thought I think it's better to treat this case like TCP_SYN_RECV
    and return a RST to the confused peer who caused the unacceptable ack_seq
    to be generated in the first place.

    Signed-off-by: H.K. Jerry Chu
    Cc: Neal Cardwell
    Cc: Yuchung Cheng
    Acked-by: Yuchung Cheng
    Acked-by: Eric Dumazet
    Acked-by: Neal Cardwell
    Signed-off-by: David S. Miller

    Jerry Chu
     
  • File pattern include/linux/*device.h matches too much, including
    completely unrelated files. Replace it with an explicit list of
    network device-related header files.

    Signed-off-by: Jean Delvare
    Cc: Joe Perches
    Acked-by: David S. Miller
    Signed-off-by: David S. Miller

    Jean Delvare
     
  • Currently, when FIFO_ERR happens, we stop the dma, wait for it to become
    idle and then reset the whole MAC_RX logic (and after that we must re-set
    multicast addresses and also re-enable MAC_RX when we're finally ready to
    accept new packets). This leads to CRC errors on high number of incoming
    packets and is not needed according to the datasheet.

    This patch fixes it by the following steps:

    1) remove this reset in pch_gbe_stop_receive(), which causes some functions
    to not be used anywhere
    2) remove already unused functions pch_gbe_wait_clr_bit_irq() and
    pch_gbe_mac_reset_rx() to correctly build
    3) move pch_gbe_enable_mac_rx() out of pch_gbe_start_receive() to
    pch_gbe_up() where it's only needed after we've removed the MAC_RX reset
    4) rename pch_gbe_start/stop_receive() to pch_gbe_enable/disable_dma_rx()
    to more precisely reflect what the functions are now doing.

    After these changes we already don't see the CRC errors and gain some
    increase in RX processing speed.

    Signed-off-by: Veaceslav Falico
    Signed-off-by: David S. Miller

    Veaceslav Falico
     
  • If we were in RX_FIFO_ERR state and entered pch_gbe_napi_poll(), we'll
    anyway clean some rx space and thus can continue to receive more packets.
    Currently, we re-set the RX_FIFO_ERR in situations when we've exhausted our
    budget for RX cleaning or cleaned some TX packets. Removing it gives us
    +20%-40% speed increase and a lot less of RX_FIFO_ERRors reported.

    Signed-off-by: Veaceslav Falico
    Signed-off-by: David S. Miller

    Veaceslav Falico
     
  • Move MAC_RX-related bits into separate functions.

    Signed-off-by: Veaceslav Falico
    Signed-off-by: David S. Miller

    Veaceslav Falico
     
  • Mike Kazantsev found 3.5 kernels and beyond were leaking memory,
    and tracked the faulty commit to a1c7fff7e18f59e ("net:
    netdev_alloc_skb() use build_skb()")

    While this commit seems fine, it uncovered a bug introduced
    in commit bad43ca8325 ("net: introduce skb_try_coalesce()), in function
    kfree_skb_partial()"):

    If head is stolen, we free the sk_buff,
    without removing references on secpath (skb->sp).

    So IPsec + IP defrag/reassembly (using skb coalescing), or
    TCP coalescing could leak secpath objects.

    Fix this bug by calling skb_release_head_state(skb) to properly
    release all possible references to linked objects.

    Reported-by: Mike Kazantsev
    Signed-off-by: Eric Dumazet
    Bisected-by: Mike Kazantsev
    Tested-by: Mike Kazantsev
    Signed-off-by: David S. Miller

    Eric Dumazet
     
  • Before use the request and response queue addr, make sure it has wrote
    to the registers.

    Signed-off-by: Joe Jin
    Cc: Jitendra Kalsaria
    Cc: Ron Mercer
    Acked-by: Jitendra Kalsaria
    Signed-off-by: David S. Miller

    Joe Jin
     
  • Add a bit TCPI_OPT_SYN_DATA (32) to the socket option TCP_INFO:tcpi_options.
    It's set if the data in SYN (sent or received) is acked by SYN-ACK. Server or
    client application can use this information to check Fast Open success rate.

    Signed-off-by: Yuchung Cheng
    Acked-by: Neal Cardwell
    Acked-by: Eric Dumazet
    Signed-off-by: David S. Miller

    Yuchung Cheng
     

22 Oct, 2012

2 commits

  • John W. Linville says:

    ====================
    This is a batch of fixes intended for the 3.7 stream.

    Dan Carpenter brings a fix for a simple signedness bug that could
    prevent the proper termination of a loop.

    Felix Fietkau found a few more places that need to use
    ieee80211_free_txskb for properly releasing SKBs used by mac80211.

    Franky Lin offers a pair of brcmfmac fixes, both fixing simple state
    reporting errors.

    Hante Meuleman corrects an error reporting case that wasn't handling
    all types of errors properly.

    Johan Hedberg offers a fix for an issue discovered at the Bluetooth
    UnPlug Fest. Gustavo says "the patch fixes a failure to pair with
    devices that support the LE Secure Connections feature."

    Johannes Berg sends an iwlwifi fix to handle a message type that
    is too large for the normal command mechanism. He also provides a
    mac80211 fix to use HT20 channels when HT40 channels are not permitted.

    Jouni Malinen offers a mac80211 fix for a masking error that was
    incorrectly marking some frames.

    Piotr Haber provides a fix to make sure bcma devices are unregistered
    properly.

    Stanislav Yakovlev gives us a fix for a panic in the ipw2200 driver.

    Stanislaw Gruszka sends a pair of fixes: one prevents a mismatch on
    connection states between cfg80211 and mac80211; the other prevents
    some frame corruption related to handling encryption.
    ====================

    Signed-off-by: David S. Miller

    David S. Miller
     
  • This patch also fixes the build failure caused due to removal of #ifdef
    CONFIG_CHELSIO_T4_OFFLOAD condition

    Signed-off-by: Vipul Pandya
    Signed-off-by: David S. Miller

    Vipul Pandya
     

20 Oct, 2012

1 commit


19 Oct, 2012

11 commits

  • Included fixes:
    - Fix broadcast packet CRC calculation which can lead to ~80% broadcast packet
    loss
    - Fix a race condition in duplicate broadcast packet check

    Signed-off-by: David S. Miller

    David S. Miller
     
  • tcp_ioctl() tries to take into account if tcp socket received a FIN
    to report correct number bytes in receive queue.

    But its flaky because if the application ate the last skb,
    we return 1 instead of 0.

    Correct way to detect that FIN was received is to test SOCK_DONE.

    Reported-by: Elliot Hughes
    Signed-off-by: Eric Dumazet
    Cc: Neal Cardwell
    Cc: Tom Herbert
    Signed-off-by: David S. Miller

    Eric Dumazet
     
  • Analyzed a few Windows driver description files, supporting
    this long list of devices:

    %ztewwan.DeviceDesc0002% = ztewwan.ndi, USB\VID_19D2&PID_0002&MI_01
    %ztewwan.DeviceDesc0012% = ztewwan.ndi, USB\VID_19D2&PID_0012&MI_01
    %ztewwan.DeviceDesc0017% = ztewwan.ndi, USB\VID_19D2&PID_0017&MI_03
    %ztewwan.DeviceDesc0021% = ztewwan.ndi, USB\VID_19D2&PID_0021&MI_04
    %ztewwan.DeviceDesc0025% = ztewwan.ndi, USB\VID_19D2&PID_0025&MI_01
    %ztewwan.DeviceDesc0031% = ztewwan.ndi, USB\VID_19D2&PID_0031&MI_04
    %ztewwan.DeviceDesc0042% = ztewwan.ndi, USB\VID_19D2&PID_0042&MI_04
    %ztewwan.DeviceDesc0049% = ztewwan.ndi, USB\VID_19D2&PID_0049&MI_05
    %ztewwan.DeviceDesc0052% = ztewwan.ndi, USB\VID_19D2&PID_0052&MI_04
    %ztewwan.DeviceDesc0055% = ztewwan.ndi, USB\VID_19D2&PID_0055&MI_01
    %ztewwan.DeviceDesc0058% = ztewwan.ndi, USB\VID_19D2&PID_0058&MI_04
    %ztewwan.DeviceDesc0063% = ztewwan.ndi, USB\VID_19D2&PID_0063&MI_04
    %ztewwan.DeviceDesc2002% = ztewwan.ndi, USB\VID_19D2&PID_2002&MI_04
    %ztewwan.DeviceDesc0104% = ztewwan.ndi, USB\VID_19D2&PID_0104&MI_04
    %ztewwan.DeviceDesc0113% = ztewwan.ndi, USB\VID_19D2&PID_0113&MI_05
    %ztewwan.DeviceDesc0118% = ztewwan.ndi, USB\VID_19D2&PID_0118&MI_05
    %ztewwan.DeviceDesc0121% = ztewwan.ndi, USB\VID_19D2&PID_0121&MI_05
    %ztewwan.DeviceDesc0123% = ztewwan.ndi, USB\VID_19D2&PID_0123&MI_04
    %ztewwan.DeviceDesc0124% = ztewwan.ndi, USB\VID_19D2&PID_0124&MI_05
    %ztewwan.DeviceDesc0125% = ztewwan.ndi, USB\VID_19D2&PID_0125&MI_06
    %ztewwan.DeviceDesc0126% = ztewwan.ndi, USB\VID_19D2&PID_0126&MI_05
    %ztewwan.DeviceDesc1008% = ztewwan.ndi, USB\VID_19D2&PID_1008&MI_04
    %ztewwan.DeviceDesc1010% = ztewwan.ndi, USB\VID_19D2&PID_1010&MI_04
    %ztewwan.DeviceDesc1012% = ztewwan.ndi, USB\VID_19D2&PID_1012&MI_04
    %ztewwan.DeviceDesc1402% = ztewwan.ndi, USB\VID_19D2&PID_1402&MI_02
    %ztewwan.DeviceDesc0157% = ztewwan.ndi, USB\VID_19D2&PID_0157&MI_05
    %ztewwan.DeviceDesc0158% = ztewwan.ndi, USB\VID_19D2&PID_0158&MI_03
    %ztewwan.DeviceDesc1401% = ztewwan.ndi, USB\VID_19D2&PID_1401&MI_02
    %ztewwan.DeviceDesc0130% = ztewwan.ndi, USB\VID_19D2&PID_0130&MI_01
    %ztewwan.DeviceDesc0133% = ztewwan.ndi, USB\VID_19D2&PID_0133&MI_03
    %ztewwan.DeviceDesc0176% = ztewwan.ndi, USB\VID_19D2&PID_0176&MI_03
    %ztewwan.DeviceDesc0178% = ztewwan.ndi, USB\VID_19D2&PID_0178&MI_03
    %ztewwan.DeviceDesc0168% = ztewwan.ndi, USB\VID_19D2&PID_0168&MI_04
    ;EuFi890
    %ztewwan.DeviceDesc0191% = ztewwan.ndi, USB\VID_19D2&PID_0191&MI_04
    ;AL621
    %ztewwan.DeviceDesc0167% = ztewwan.ndi, USB\VID_19D2&PID_0167&MI_04
    ;MF821
    %ztewwan.DeviceDesc0199% = ztewwan.ndi, USB\VID_19D2&PID_0199&MI_01
    %ztewwan.DeviceDesc0200% = ztewwan.ndi, USB\VID_19D2&PID_0200&MI_01
    %ztewwan.DeviceDesc0257% = ztewwan.ndi, USB\VID_19D2&PID_0257&MI_03
    ;MF821V
    %ztewwan.DeviceDesc1018% = ztewwan.ndi, USB\VID_19D2&PID_1018&MI_03
    ;MF91
    %ztewwan.DeviceDesc1426% = ztewwan.ndi, USB\VID_19D2&PID_1426&MI_02
    ;0141
    %ztewwan.DeviceDesc1247% = ztewwan.ndi, USB\VID_19D2&PID_1247&MI_04
    %ztewwan.DeviceDesc1425% = ztewwan.ndi, USB\VID_19D2&PID_1425&MI_02
    %ztewwan.DeviceDesc1424% = ztewwan.ndi, USB\VID_19D2&PID_1424&MI_02
    %ztewwan.DeviceDesc1252% = ztewwan.ndi, USB\VID_19D2&PID_1252&MI_04
    %ztewwan.DeviceDesc1254% = ztewwan.ndi, USB\VID_19D2&PID_1254&MI_04
    %ztewwan.DeviceDesc1255A% = ztewwan.ndi, USB\VID_19D2&PID_1255&MI_03
    %ztewwan.DeviceDesc1255B% = ztewwan.ndi, USB\VID_19D2&PID_1255&MI_04
    %ztewwan.DeviceDesc1256% = ztewwan.ndi, USB\VID_19D2&PID_1256&MI_04
    %ztewwan.DeviceDesc1245% = ztewwanCombB.ndi, USB\VID_19D2&PID_1245&MI_04
    %ztewwan.DeviceDesc1021% = ztewwan.ndi, USB\VID_19D2&PID_1021&MI_02

    Adding the ones we were missing.

    Signed-off-by: Bjørn Mork
    Signed-off-by: David S. Miller

    Bjørn Mork
     
  • On some suspend/resume operations involving wimax device, we have
    noticed some intermittent memory corruptions in netlink code.

    Stéphane Marchesin tracked this corruption in netlink_update_listeners()
    and suggested a patch.

    It appears netlink_release() should use kfree_rcu() instead of kfree()
    for the listeners structure as it may be used by other cpus using RCU
    protection.

    netlink_release() must set to NULL the listeners pointer when
    it is about to be freed.

    Also have to protect netlink_update_listeners() and
    netlink_has_listeners() if listeners is NULL.

    Add a nl_deref_protected() lockdep helper to properly document which
    locks protects us.

    Reported-by: Jonathan Kliegman
    Signed-off-by: Eric Dumazet
    Cc: Stéphane Marchesin
    Cc: Sam Leffler
    Signed-off-by: David S. Miller

    Eric Dumazet
     
  • Currently we can not flush cached pmtu/redirect informations via
    the ipv4_sysctl_rtcache_flush sysctl. We need to check the rt_genid
    of the old route and reset the nh exeption if the old route is
    expired when we bind a new route to a nh exeption.

    Signed-off-by: Steffen Klassert
    Acked-by: Eric Dumazet
    Signed-off-by: David S. Miller

    Steffen Klassert
     
  • vlan_info might be present but still no vlan devices might be there.
    That is in case of vlan0 automatically added.

    So in that case, allow to change netdev type.

    Reported-by: Jon Stanley
    Signed-off-by: Jiri Pirko
    Signed-off-by: David S. Miller

    Jiri Pirko
     
  • This driver add support for wake over lan on AT803x phys.

    Signed-off-by: Matus Ujhelyi
    Signed-off-by: David S. Miller

    Matus Ujhelyi
     
  • I noticed that the iPhone ethernet driver did not support
    iPhone 5. I quickly added support to it in my kernel, here's
    a patch.

    Signed-off-by: Jay Purohit
    Acked-by: Valdis Kletnieks
    Signed-off-by: Jan Ceuleers
    Signed-off-by: David S. Miller

    Jay Purohit
     
  • Pablo Neira Ayuso Says:

    ====================
    The following patchset contains Netfilter/IPVS updates for your
    net tree, they are:

    * Fix incorrect hooks for SNAT and DNAT (bug introduced in recent IPv6
    NAT changes), from Elison Niven.

    * Fix xt_TEE (got broken with recent rt_gateway semantic change),
    from Eric Dumazet.

    * Fix custom conntrack timeout policy attachment for IPv6, from myself.

    * Always initialize ip_vs_timeout_user in case that TCP or UDP protocols
    is disabled, from Arnd Bergmann.

    Note that I had to pull from your tree to obtain:

    (c92b96553a80c1 ipv4: Add FLOWI_FLAG_KNOWN_NH)

    which was required for the xt_TEE fix.
    ====================

    Signed-off-by: David S. Miller

    David S. Miller
     
  • Threads in the bottom half of batadv_bla_check_bcast_duplist() might
    otherwise for instance overwrite variables which other threads might
    be using/reading at the same time in the top half, potentially
    leading to messing up the bcast_duplist, possibly resulting in false
    bridge loop avoidance duplicate check decisions.

    Signed-off-by: Linus Lüssing
    Acked-by: Simon Wunderlich
    Signed-off-by: Marek Lindner

    Linus Lüssing
     
  • So far the crc16 checksum for a batman-adv broadcast data packet, received
    on a batman-adv hard interface, was calculated over zero bytes of its
    content leading to many incoming broadcast data packets wrongly being
    dropped (60-80% packet loss).

    This patch fixes this issue by calculating the crc16 over the actual,
    complete broadcast payload.

    The issue is a regression introduced by
    ("batman-adv: add broadcast duplicate check").

    Signed-off-by: Linus Lüssing
    Acked-by: Simon Wunderlich
    Signed-off-by: Marek Lindner

    Linus Lüssing
     

18 Oct, 2012

5 commits

  • The capability defines have moved causing the auto generated names
    of capabilities that apparmor uses in logging to be incorrect.

    Fix the autogenerated table source to uapi/linux/capability.h

    Reported-by: YanHong
    Reported-by: Krzysztof Kolasa
    Analyzed-by: Al Viro
    Signed-off-by: John Johansen
    Acked-by: David Howells
    Acked-by: James Morris
    Signed-off-by: Linus Torvalds

    John Johansen
     
  • Pull misc UAPI fixes from David Howells:
    "They do a number of things:

    (1) Import a patch from Catalin Marinas to extend the generic-y in
    Kbuild facility to uapi directories.

    (2) Make arch/tile's ucontext.h file use (1) and remove the header-y
    line from the kernel internal side of things.

    (3) Remove some now-empty conditional bits from include/linux/Kbuild.
    The contents got moved to the UAPI side of things along with new
    conditionals.

    (4) Deal with now-empty files:

    (a) Empty Kbuild files under include/ get removed.

    (b) Empty Kbuild files under arch/ get comments to hold them as
    they are likely to end up with generic-y or genhdr-y lines.
    Deleting them appears to work if we want to go that route.

    (c) Put a comment into uapi/asm-generic/kvm_para.h to prevent the
    patch program from deleting that, and made the arches with
    empty kvm_para.h uapi files use that instead of having their
    own files.

    (d) Put comments into four other empty uapi/ headers to prevent the
    patch program from deleting them.

    A question: Is this the right way to deal with the now-empty Kbuild
    files?

    The ones under include/ are unlikely to be used - even for generated
    files, I think - so getting rid of them is probably okay. Once all
    the bits are in, we can probably remove all the Kbuild files under
    include/ that aren't also under include/uapi/.

    The ones under arch/ are more of an issue because of the potential for
    generic-y and genhdr-y."

    * tag 'uapi-fixes-20121017' of git://git.infradead.org/users/dhowells/linux-headers:
    UAPI: Make arch/sparc/include/uapi/asm/sigcontext.h non-empty
    UAPI: Make arch/sh/include/uapi/asm/hw_breakpoint.h non-empty
    UAPI: Make arch/mn10300/include/uapi/asm/setup.h non-empty
    UAPI: Put a comment into uapi/asm-generic/kvm_para.h and use it from arches
    UAPI: The tile arch uses the generic ucontext.h file
    UAPI: Place comments in empty arch Kbuilds to make them non-empty
    UAPI: Remove empty non-UAPI Kbuild files
    UAPI: Remove empty conditionals from include/linux/Kbuild
    UAPI: Make uapi/linux/irqnr.h non-empty
    uapi: Allow automatic generation of uapi/asm/ header files

    Linus Torvalds
     
  • John W. Linville
     
  • Pull networking fixes from David Miller:

    1) Fix regression in /proc/net/if_inet6, sometimes devices do not get
    listed. From Eric Dumazet.

    2) Add IPSEC networking sub-section to MAINTAINERS.

    3) S390 networking fixes from Hendrik Brueckner and Stefan Raspl.

    4) Fix enslavement of devices that can't do VLAN properly, from Jiri
    Pirko.

    5) SCTP sack handling fix from Zijie Pan.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
    ipv6: addrconf: fix /proc/net/if_inet6
    bnx2x: fix handling mf storage modes
    qeth: fix deadlock between recovery and bonding driver
    smsgiucv: reestablish IUCV path after resume
    sctp: fix call to SCTP_CMD_PROCESS_SACK in sctp_cmd_interpreter()
    vlan: fix bond/team enslave of vlan challenged slave/port
    MAINTAINERS: Add explicit section for IPSEC networking.

    Linus Torvalds
     
  • Pull sparc fixes from David Miller:
    "Two sparc64 perf bug fixes and add a sysrq facility so I can diagnose
    these kinds of problems more quickly in the future."

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
    sparc64: Fix bit twiddling in sparc_pmu_enable_event().
    sparc64: Add global PMU register dumping via sysrq.
    sparc64: Like x86 we should check current->mm during perf backtrace generation.

    Linus Torvalds
     

17 Oct, 2012

1 commit

  • Some changes to fix issues with HT40 APs in Korea
    and follow-up changes to allow using HT40 even if
    the local regulatory database disallows it caused
    issues with iwlwifi (and could cause issues with
    other devices); iwlwifi firmware would assert if
    you tried to connect to an AP that has an invalid
    configuration (e.g. using HT40- on channel 140.)

    Fix this, while avoiding the "Korean AP" issue by
    disabling HT40 and advertising HT20 to the AP
    when connecting.

    Cc: stable@vger.kernel.org [3.6]
    Reported-by: Florian Reitmeir
    Tested-by: Florian Reitmeir
    Signed-off-by: Johannes Berg

    Johannes Berg