1. 26 Jan, 2012 26 commits
  2. 25 Jan, 2012 7 commits
  3. 24 Jan, 2012 7 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 701b259f
      Linus Torvalds authored
      Davem says:
      
      1) Fix JIT code generation on x86-64 for divide by zero, from Eric Dumazet.
      
      2) tg3 header length computation correction from Eric Dumazet.
      
      3) More build and reference counting fixes for socket memory cgroup
         code from Glauber Costa.
      
      4) module.h snuck back into a core header after all the hard work we
         did to remove that, from Paul Gortmaker and Jesper Dangaard Brouer.
      
      5) Fix PHY naming regression and add some new PCI IDs in stmmac, from
         Alessandro Rubini.
      
      6) Netlink message generation fix in new team driver, should only advertise
         the entries that changed during events, from Jiri Pirko.
      
      7) SRIOV VF registration and unregistration fixes, and also add a
         missing PCI ID, from Roopa Prabhu.
      
      8) Fix infinite loop in tx queue flush code of brcmsmac, from Stanislaw Gruszka.
      
      9) ftgmac100/ftmac100 build fix, missing interrupt.h include.
      
      10) Memory leak fix in net/hyperv do_set_mutlicast() handling, from Wei Yongjun.
      
      11) Off by one fix in netem packet scheduler, from Vijay Subramanian.
      
      12) TCP loss detection fix from Yuchung Cheng.
      
      13) TCP reset packet MD5 calculation uses wrong address, fix from Shawn Lu.
      
      14) skge carrier assertion and DMA mapping fixes from Stephen Hemminger.
      
      15) Congestion recovery undo performed at the wrong spot in BIC and CUBIC
          congestion control modules, fix from Neal Cardwell.
      
      16) Ethtool ETHTOOL_GSSET_INFO is unnecessarily restrictive, from Michał Mirosław.
      
      17) Fix triggerable race in ipv6 sysctl handling, from Francesco Ruggeri.
      
      18) Statistics bug fixes in mlx4 from Eugenia Emantayev.
      
      19) rds locking bug fix during info dumps, from your's truly.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (67 commits)
        rds: Make rds_sock_lock BH rather than IRQ safe.
        netprio_cgroup.h: dont include module.h from other includes
        net: flow_dissector.c missing include linux/export.h
        team: send only changed options/ports via netlink
        net/hyperv: fix possible memory leak in do_set_multicast()
        drivers/net: dsa/mv88e6xxx.c files need linux/module.h
        stmmac: added PCI identifiers
        llc: Fix race condition in llc_ui_recvmsg
        stmmac: fix phy naming inconsistency
        dsa: Add reporting of silicon revision for Marvell 88E6123/88E6161/88E6165 switches.
        tg3: fix ipv6 header length computation
        skge: add byte queue limit support
        mv643xx_eth: Add Rx Discard and Rx Overrun statistics
        bnx2x: fix compilation error with SOE in fw_dump
        bnx2x: handle CHIP_REVISION during init_one
        bnx2x: allow user to change ring size in ISCSI SD mode
        bnx2x: fix Big-Endianess in ethtool -t
        bnx2x: fixed ethtool statistics for MF modes
        bnx2x: credit-leakage fixup on vlan_mac_del_all
        macvlan: fix a possible use after free
        ...
      701b259f
    • David S. Miller's avatar
      ip_gre: Fix bug added to ipgre_tunnel_xmit(). · 61d57f87
      David S. Miller authored
      We can remove the rt_gateway == 0 check but we shouldn't
      remove the 'dst' initialization too.
      
      Noticed by Eric Dumazet.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      61d57f87
    • David S. Miller's avatar
      ipip: Fix bug added to ipip_tunnel_xmit(). · 658c8d96
      David S. Miller authored
      We can remove the rt_gateway == 0 check but we shouldn't
      remove the 'dst' initialization too.
      
      Noticed by Eric Dumazet.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      658c8d96
    • David S. Miller's avatar
      ipv4: Remove bogus checks of rt_gateway being zero. · 496053f4
      David S. Miller authored
      It can never actually happen.  rt_gateway is either the fully resolved
      flow lookup key's destination address, or the non-zero FIB entry gateway
      address.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      496053f4
    • David S. Miller's avatar
      rds: Make rds_sock_lock BH rather than IRQ safe. · efc3dbc3
      David S. Miller authored
      rds_sock_info() triggers locking warnings because we try to perform a
      local_bh_enable() (via sock_i_ino()) while hardware interrupts are
      disabled (via taking rds_sock_lock).
      
      There is no reason for rds_sock_lock to be a hardware IRQ disabling
      lock, none of these access paths run in hardware interrupt context.
      
      Therefore making it a BH disabling lock is safe and sufficient to
      fix this bug.
      Reported-by: default avatarKumar Sanghvi <kumaras@chelsio.com>
      Reported-by: default avatarJosh Boyer <jwboyer@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      efc3dbc3
    • Paul Gortmaker's avatar
      netprio_cgroup.h: dont include module.h from other includes · 36a12119
      Paul Gortmaker authored
      A considerable effort was invested in wiping out module.h
      from being present in all the other standard includes.  This
      one leaked back in, but once again isn't strictly necessary,
      so remove it.
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      36a12119
    • Jesper Dangaard Brouer's avatar
      net: flow_dissector.c missing include linux/export.h · c452ed70
      Jesper Dangaard Brouer authored
      The file net/core/flow_dissector.c seems to be missing
      including linux/export.h.
      Signed-off-by: default avatarJesper Dangaard Brouer <hawk@comx.dk>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c452ed70