1. 17 Jun, 2013 6 commits
  2. 14 Jun, 2013 13 commits
  3. 13 Jun, 2013 15 commits
  4. 12 Jun, 2013 6 commits
    • Cong Wang's avatar
      net: add doc for ip_early_demux sysctl · e3d73bce
      Cong Wang authored
      commit 6648bd7e (ipv4: Add sysctl knob to control
      early socket demux) introduced such sysctl, but forgot to add
      doc into Documentation/networking/ip-sysctl.txt. This patch adds it.
      
      Basically I grab the doc from the description of commit 41063e9d
      
      
      (ipv4: Early TCP socket demux.) and the above commit.
      
      Cc: Eric Dumazet <edumazet@google.com>
      Cc: Alexander Duyck <alexander.h.duyck@intel.com>
      Cc: David S. Miller <davem@davemloft.net>
      Signed-off-by: default avatarCong Wang <amwang@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e3d73bce
    • Pavel Emelyanov's avatar
      tun: Turn tun_flow_init() into void fn · 944a1376
      Pavel Emelyanov authored
      This routine doesn't fail since 9fdc6bef
      
       (tuntap: dont use a private kmem_cache)
      so it makes sense to compact the code a little bit.
      Signed-off-by: default avatarPavel Emelyanov <xemul@parallels.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      944a1376
    • Pavel Emelyanov's avatar
      tun: Report "persist" flag to userspace · 274038f8
      Pavel Emelyanov authored
      
      
      The TUN_PERSIST flag is not reported at all -- both TUNGETIFF, and sysfs
      "flags" attribute skip one. Knowing whether a device is persistent or not
      is critical for checkpoint-restore, thus I propose to add the read-only
      IFF_PERSIST one for this.
      
      Setting this new IFF_PERSIST is hardly possible, as TUNSETIFF doesn't check
      for unknown flags being zero and thus there can be trash.
      Signed-off-by: default avatarPavel Emelyanov <xemul@parallels.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      274038f8
    • Eric Dumazet's avatar
      udp: fix two sparse errors · 7c0cadc6
      Eric Dumazet authored
      commit ba418fa3
      
       ("soreuseport: UDP/IPv4 implementation")
      added following sparse errors :
      
      net/ipv4/udp.c:433:60: warning: cast from restricted __be16
      net/ipv4/udp.c:433:60: warning: incorrect type in argument 1 (different base types)
      net/ipv4/udp.c:433:60:    expected unsigned short [unsigned] [usertype] val
      net/ipv4/udp.c:433:60:    got restricted __be16 [usertype] sport
      net/ipv4/udp.c:433:60: warning: cast from restricted __be16
      net/ipv4/udp.c:433:60: warning: cast from restricted __be16
      net/ipv4/udp.c:514:60: warning: cast from restricted __be16
      net/ipv4/udp.c:514:60: warning: incorrect type in argument 1 (different base types)
      net/ipv4/udp.c:514:60:    expected unsigned short [unsigned] [usertype] val
      net/ipv4/udp.c:514:60:    got restricted __be16 [usertype] sport
      net/ipv4/udp.c:514:60: warning: cast from restricted __be16
      net/ipv4/udp.c:514:60: warning: cast from restricted __be16
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7c0cadc6
    • Eric Dumazet's avatar
      gro: remove a sparse error · 5b9b6263
      Eric Dumazet authored
      Fix following sparse error :
      
      net/ipv4/af_inet.c:1410:59: warning: restricted __be16 degrades to
      integer
      
      added in commit db8caf3d
      
      
      ("gro: should aggregate frames without DF")
      Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
      From: Eric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      5b9b6263
    • David S. Miller's avatar
      Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next · 4a2e667a
      David S. Miller authored
      
      
      John W. Linville says:
      
      ====================
      This pull request is intended for the 3.11 stream...
      
      One big highlight is the cw1200 driver the ST-E CW1100 & CW1200
      WLAN chipsets.  This one has been lingering for a while, lacking
      some review comments.  Once started getting pulled into linux-next,
      it got a bit more attention and a number of improvements were made
      over the initial cut.  No doubt there will be more changes ahead,
      but I think it is looking alright at this point.
      
      Along with that, there is the usual flurry of updates to the mac80211
      core and the iwlwifi, mwifiex, ath9k, rt2x00, wil6210, and other
      drivers.  A few of the highlights are some rt2x00 refactoring/cleanup
      by Gabor Juhos, some rt2800 hardware support enhancements by Stanislaw
      Gruszka, some iwlwifi power management updates from Alexander Bondar,
      some enhanced bcma SPROM support from Rafał Miłecki, and a variety
      of other things here and there.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4a2e667a