1. 25 7月, 2012 8 次提交
    • A
      caif: fix NULL pointer check · c66b9b7d
      Alan Cox 提交于
      Reported-by: <rucsoftsec@gmail.com>
      Resolves-bug: http://bugzilla.kernel.org/show_bug?44441Signed-off-by: NAlan Cox <alan@linux.intel.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c66b9b7d
    • J
      team: init error value to 0 in team_netpoll_setup() · 3324d024
      Jiri Pirko 提交于
      This will ensure correct value is returned in case the port list is empty.
      Signed-off-by: NJiri Pirko <jiri@resnulli.us>
      Reported-by: NEric Dumazet <edumazet@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3324d024
    • E
      tcp: early_demux fixes · 9cb429d6
      Eric Dumazet 提交于
      1) Remove a non needed pskb_may_pull() in tcp_v4_early_demux()
         and fix a potential bug if skb->head was reallocated
         (iph & th pointers were not reloaded)
      
      TCP stack will pull/check headers anyway.
      
      2) must reload iph in ip_rcv_finish() after early_demux()
       call since skb->head might have changed.
      
      3) skb->dev->ifindex can be now replaced by skb->skb_iif
      Signed-off-by: NEric Dumazet <edumazet@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      9cb429d6
    • Y
      bnx2x: Correct EEE statistics gathering · c20cd5d7
      Yuval Mintz 提交于
      In boards with 4-ports, Tx LPI statistics were gathered incorrectly.
      This patch guarantees that each pmf will only query its own port for
      these statistics.
      Signed-off-by: NYuval Mintz <yuvalmin@broadcom.com>
      Signed-off-by: NEilon Greenstein <eilong@broadcom.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c20cd5d7
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · 3c4cfade
      Linus Torvalds 提交于
      Pull networking changes from David S Miller:
      
       1) Remove the ipv4 routing cache.  Now lookups go directly into the FIB
          trie and use prebuilt routes cached there.
      
          No more garbage collection, no more rDOS attacks on the routing
          cache.  Instead we now get predictable and consistent performance,
          no matter what the pattern of traffic we service.
      
          This has been almost 2 years in the making.  Special thanks to
          Julian Anastasov, Eric Dumazet, Steffen Klassert, and others who
          have helped along the way.
      
          I'm sure that with a change of this magnitude there will be some
          kind of fallout, but such things ought the be simple to fix at this
          point.  Luckily I'm not European so I'll be around all of August to
          fix things :-)
      
          The major stages of this work here are each fronted by a forced
          merge commit whose commit message contains a top-level description
          of the motivations and implementation issues.
      
       2) Pre-demux of established ipv4 TCP sockets, saves a route demux on
          input.
      
       3) TCP SYN/ACK performance tweaks from Eric Dumazet.
      
       4) Add namespace support for netfilter L4 conntrack helpers, from Gao
          Feng.
      
       5) Add config mechanism for Energy Efficient Ethernet to ethtool, from
          Yuval Mintz.
      
       6) Remove quadratic behavior from /proc/net/unix, from Eric Dumazet.
      
       7) Support for connection tracker helpers in userspace, from Pablo
          Neira Ayuso.
      
       8) Allow userspace driven TX load balancing functions in TEAM driver,
          from Jiri Pirko.
      
       9) Kill off NLMSG_PUT and RTA_PUT macros, more gross stuff with
          embedded gotos.
      
      10) TCP Small Queues, essentially minimize the amount of TCP data queued
          up in the packet scheduler layer.  Whereas the existing BQL (Byte
          Queue Limits) limits the pkt_sched --> netdevice queuing levels,
          this controls the TCP --> pkt_sched queueing levels.
      
          From Eric Dumazet.
      
      11) Reduce the number of get_page/put_page ops done on SKB fragments,
          from Alexander Duyck.
      
      12) Implement protection against blind resets in TCP (RFC 5961), from
          Eric Dumazet.
      
      13) Support the client side of TCP Fast Open, basically the ability to
          send data in the SYN exchange, from Yuchung Cheng.
      
          Basically, the sender queues up data with a sendmsg() call using
          MSG_FASTOPEN, then they do the connect() which emits the queued up
          fastopen data.
      
      14) Avoid all the problems we get into in TCP when timers or PMTU events
          hit a locked socket.  The TCP Small Queues changes added a
          tcp_release_cb() that allows us to queue work up to the
          release_sock() caller, and that's what we use here too.  From Eric
          Dumazet.
      
      15) Zero copy on TX support for TUN driver, from Michael S. Tsirkin.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1870 commits)
        genetlink: define lockdep_genl_is_held() when CONFIG_LOCKDEP
        r8169: revert "add byte queue limit support".
        ipv4: Change rt->rt_iif encoding.
        net: Make skb->skb_iif always track skb->dev
        ipv4: Prepare for change of rt->rt_iif encoding.
        ipv4: Remove all RTCF_DIRECTSRC handliing.
        ipv4: Really ignore ICMP address requests/replies.
        decnet: Don't set RTCF_DIRECTSRC.
        net/ipv4/ip_vti.c: Fix __rcu warnings detected by sparse.
        ipv4: Remove redundant assignment
        rds: set correct msg_namelen
        openvswitch: potential NULL deref in sample()
        tcp: dont drop MTU reduction indications
        bnx2x: Add new 57840 device IDs
        tcp: avoid oops in tcp_metrics and reset tcpm_stamp
        niu: Change niu_rbr_fill() to use unlikely() to check niu_rbr_add_page() return value
        niu: Fix to check for dma mapping errors.
        net: Fix references to out-of-scope variables in put_cmsg_compat()
        net: ethernet: davinci_emac: add pm_runtime support
        net: ethernet: davinci_emac: Remove unnecessary #include
        ...
      3c4cfade
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · e017507f
      Linus Torvalds 提交于
      Pull s390 changes from Martin Schwidefsky:
       "No new functions, a few changes to make the code more robust, some
        cleanups and bug fixes."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (21 commits)
        s390/vtimer: rework virtual timer interface
        s390/dis: Add the servc instruction to the disassembler.
        s390/comments: unify copyright messages and remove file names
        s390/lgr: Add init check to lgr_info_log()
        s390/cpu init: use __get_cpu_var instead of per_cpu
        s390/idle: reduce size of s390_idle_data structure
        s390/idle: fix sequence handling vs cpu hotplug
        s390/ap: resend enable adapter interrupt request.
        s390/hypfs: Add missing get_next_ino()
        s390/dasd: add shutdown action
        s390/ipl: Fix ipib handling for "dumpreipl" shutdown action
        s390/smp: make absolute lowcore / cpu restart parameter accesses more robust
        s390/vmlogrdr: cleanup driver attribute usage
        s390/vmlogrdr: cleanup device attribute usage
        s390/ccwgroup: remove unused ccwgroup_device member
        s390/cio/chp: cleanup attribute usage
        s390/sigp: use sigp order code defines in assembly code
        s390/smp: use sigp cpu status definitions
        s390/smp/kvm: unifiy sigp definitions
        s390/smp: remove redundant check
        ...
      e017507f
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin · 759e2a25
      Linus Torvalds 提交于
      Pull blackfin changes from Bob Liu:
       "The big changes are adding PM and HDMI support for bf60x, other
        patches are various bug fix and code cleanup."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin: (48 commits)
        bf60x: fix build warning
        PM: add BF60x flash suspend and resume support
        blackfin: twi: read twi mmr via bfin_read macro
        dpm: deepsleep: reserve stack
        bf60x: cpufreq: fix anomaly 05000273
        bf609: add adv7511 display support
        blackfin: cplb-nompu: fix ROM cplb size for bf609-ezkit
        bf60x: Add double fault, hardware error and NMI SEC handler
        bf60x: update anomaly id in serial and twi driver headers.
        bf60x: vs6624 pin update
        bf60x: add default anomaly setting.
        bf60x: update bf60x anomaly list.
        bf60x: sec: Enable sec interrupt source priority configuration.
        bf60x: sec: Clean up interrupt initialization code for SEC.
        bf609: reuse bf5xx-i2s-pcm.c as i2s pcm driver
        bf561: add capabilities in adv7183_inputs
        bf609: convert vs6624 blank_clocks to black_pixels
        blackfin: fix musb macro name
        cleanup: sec and linkport only built on bf60x
        bfin: pint: add pint suspend and resume
        ...
      759e2a25
    • L
      Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming · 90e66dd9
      Linus Torvalds 提交于
      Pull C6X changes from Mark Salter:
      
        - remove use of legacy irqs which really wasn't needed
        - add support for C66x SoC on EVMC6678 board
        - clean up compiler warning
      
      * tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
        C6X: clean up compiler warning
        C6X: add basic support for TMS320C6678 SoC
        C6X: remove dependence on legacy IRQs
        C6X: remove megamod-pic requirement on direct-mapped core pic
      90e66dd9
  2. 24 7月, 2012 32 次提交