1. 24 Jul, 2014 10 commits
  2. 23 Jul, 2014 25 commits
  3. 22 Jul, 2014 5 commits
    • Tobias Klauser's avatar
      net: skbuff: Use ALIGN macro instead of open coding it · 0bec8c88
      Tobias Klauser authored
      Use ALIGN from linux/kernel.h to define SKB_DATA_ALIGN instead of open
      coding it.
      Signed-off-by: default avatarTobias Klauser <tklauser@distanz.ch>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0bec8c88
    • David Laight's avatar
      net: sctp: Rename SCTP_XMIT_NAGLE_DELAY to SCTP_XMIT_DELAY · 526cbef7
      David Laight authored
      MSG_MORE and 'corking' a socket would require that the transmit of
      a data chunk be delayed.
      Rename the return value to be less specific.
      Signed-off-by: default avatarDavid Laight <david.laight@aculab.com>
      Acked-by: default avatarVlad Yasevich <vyasevich@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      526cbef7
    • David Laight's avatar
      net: sctp: Open out the check for Nagle · 723189fa
      David Laight authored
      The check for Nagle contains 6 separate checks all of which must be true
      before a data packet is delayed.
      Separate out each into its own 'if (test) return SCTP_XMIT_OK' so that
      the reasons can be individually described.
      
      Also return directly with SCTP_XMIT_RWND_FULL.
      Delete the now-unused 'retval' variable and 'finish' label from
      sctp_packet_can_append_data().
      Signed-off-by: default avatarDavid Laight <david.laight@aculab.com>
      Acked-by: default avatarVlad Yasevich <vyasevich@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      723189fa
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 8fd90bb8
      David S. Miller authored
      Conflicts:
      	drivers/infiniband/hw/cxgb4/device.c
      
      The cxgb4 conflict was simply overlapping changes.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8fd90bb8
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 15ba2236
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Null termination fix in dns_resolver got the pointer dereferncing
          wrong, fix from Ben Hutchings.
      
       2) ip_options_compile() has a benign but real buffer overflow when
          parsing options.  From Eric Dumazet.
      
       3) Table updates can crash in netfilter's nftables if none of the state
          flags indicate an actual change, from Pablo Neira Ayuso.
      
       4) Fix race in nf_tables dumping, also from Pablo.
      
       5) GRE-GRO support broke the forwarding path because the segmentation
          state was not fully initialized in these paths, from Jerry Chu.
      
       6) sunvnet driver leaks objects and potentially crashes on module
          unload, from Sowmini Varadhan.
      
       7) We can accidently generate the same handle for several u32
          classifier filters, fix from Cong Wang.
      
       8) Several edge case bug fixes in fragment handling in xen-netback,
          from Zoltan Kiss.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (21 commits)
        ipv4: fix buffer overflow in ip_options_compile()
        batman-adv: fix TT VLAN inconsistency on VLAN re-add
        batman-adv: drop QinQ claim frames in bridge loop avoidance
        dns_resolver: Null-terminate the right string
        xen-netback: Fix pointer incrementation to avoid incorrect logging
        xen-netback: Fix releasing header slot on error path
        xen-netback: Fix releasing frag_list skbs in error path
        xen-netback: Fix handling frag_list on grant op error path
        net_sched: avoid generating same handle for u32 filters
        net: huawei_cdc_ncm: add "subclass 3" devices
        net: qmi_wwan: add two Sierra Wireless/Netgear devices
        wan/x25_asy: integer overflow in x25_asy_change_mtu()
        net: ppp: fix creating PPP pass and active filters
        net/mlx4_en: cq->irq_desc wasn't set in legacy EQ's
        sunvnet: clean up objects created in vnet_new() on vnet_exit()
        r8169: Enable RX_MULTI_EN for RTL_GIGA_MAC_VER_40
        net-gre-gro: Fix a bug that breaks the forwarding path
        netfilter: nf_tables: 64bit stats need some extra synchronization
        netfilter: nf_tables: set NLM_F_DUMP_INTR if netlink dumping is stale
        netfilter: nf_tables: safe RCU iteration on list when dumping
        ...
      15ba2236