1. 18 Oct, 2013 36 commits
  2. 17 Oct, 2013 4 commits
    • David S. Miller's avatar
      Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next · 5cda73b6
      David S. Miller authored
      John W. Linville says:
      
      ====================
      This is a batch of updates intended for the 3.13 stream...
      
      The biggest item of interest in here is wcn36xx, the new mac80211
      driver for Qualcomm WCN3660/WCN3680 hardware.
      
      Regarding the mac80211 bits, Johannes says:
      
      "We have an assortment of cleanups and new features, of which the
      biggest one is probably the channel-switch support in IBSS. Nothing
      else really stands out much."
      
      On top of that, the ath9k and rt2x00 get a lot of update action from
      Felix Fietkau and Gabor Juhos, respectively.  There are a handful of
      updates to other drivers here and there as well.
      
      Please let me know if there are problems!
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      5cda73b6
    • Eric Dumazet's avatar
      ipv4: shrink rt_cache_stat · 0baf2b35
      Eric Dumazet authored
      Half of the rt_cache_stat fields are no longer used after IP
      route cache removal, lets shrink this per cpu area.
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0baf2b35
    • Randy Dunlap's avatar
      netdev: inet_timewait_sock.h missing semi-colon when KMEMCHECK is enabled · a5bb202b
      Randy Dunlap authored
      Fix (a few hundred) build errors due to missing semi-colon when
      KMEMCHECK is enabled:
      
        include/net/inet_timewait_sock.h:139:2: error: expected ',', ';' or '}' before 'int'
        include/net/inet_timewait_sock.h:148:28: error: 'const struct inet_timewait_sock' has no member named 'tw_death_node'
      Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a5bb202b
    • David S. Miller's avatar
      Merge branch 'xen_netback' · 206f3985
      David S. Miller authored
      xen-netback: IPv6 offload support
      
      ====================
      This patch series adds support for checksum and large packet offloads
      into xen-netback.  Testing has mainly been done using the Microsoft
      network hardware certification suite running in Server 2008R2 VMs with
      Citrix PV frontends.
      
      v2:
      - Fixed Wei's email address in Cc lines
      
      v3:
      - Responded to Wei's comments:
       - netif.h now updated with comments and a definition of
         XEN_NETIF_GSO_TYPE_NONE.
       - limited number of pullups
      - Responded to Annie's comments:
       - New GSO_BIT macro
      
      v4:
      - Responded to more of Wei's comments
      - Remove parsing of IPv6 fragment header and added warning
      
      v5:
      - Added comment concerning the value chosen for PKT_PROT_LEN
      - Dropped deprecation of feature-no-csum-offload
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      206f3985