1. 09 Dec, 2012 3 commits
    • Joseph Gasparakis's avatar
      net: Add support for hardware-offloaded encapsulation · 6a674e9c
      Joseph Gasparakis authored
      This patch adds support in the kernel for offloading in the NIC Tx and Rx
      checksumming for encapsulated packets (such as VXLAN and IP GRE).
      
      For Tx encapsulation offload, the driver will need to set the right bits
      in netdev->hw_enc_features. The protocol driver will have to set the
      skb->encapsulation bit and populate the inner headers, so the NIC driver will
      use those inner headers to calculate the csum in hardware.
      
      For Rx encapsulation offload, the driver will need to set again the
      skb->encapsulation flag and the skb->ip_csum to CHECKSUM_UNNECESSARY.
      In that case the protocol driver should push the decapsulated packet up
      to the stack, again with CHECKSUM_UNNECESSARY. In ether case, the protocol
      driver should set the skb->encapsulation flag back to zero. Finally the
      protocol driver should have NETIF_F_RXCSUM flag set in its features.
      Signed-off-by: default avatarJoseph Gasparakis <joseph.gasparakis@intel.com>
      Signed-off-by: default avatarPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
      Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6a674e9c
    • françois romieu's avatar
      r8169: workaround for missing extended GigaMAC registers · 9ecb9aab
      françois romieu authored
      GigaMAC registers have been reported left unitialized in several
      situations:
      - after cold boot from power-off state
      - after S3 resume
      
      Tweaking rtl_hw_phy_config takes care of both.
      
      This patch removes an excess entry (",") at the end of the exgmac_reg
      array as well.
      Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
      Signed-off-by: default avatarWang YanQing <udknight@gmail.com>
      Cc: Hayes Wang <hayeswang@realtek.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9ecb9aab
    • David S. Miller's avatar
      Merge branch 'tipc_net-next_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux · ba501666
      David S. Miller authored
      Paul Gortmaker says:
      
      ====================
      Changes since v1:
      	-get rid of essentially unused variable spotted by
      	 Neil Horman (patch #2)
      
      	-drop patch #3; defer it for 3.9 content, so Neil,
      	 Jon and Ying can discuss its specifics at their
      	 leisure while net-next is closed.  (It had no
      	 direct dependencies to the rest of the series, and
      	 was just an optimization)
      
      	-fix indentation of accept() code directly in place
      	 vs. forking it out to a separate function (was patch
      	 #10, now patch #9).
      
      Rebuilt and re-ran tests just to ensure nothing odd happened.
      
      Original v1 text follows, updated pull information follows that.
      
                 ---------
      
      Here is another batch of TIPC changes.  The most interesting
      thing is probably the non-blocking socket connect - I'm told
      there were several users looking forward to seeing this.
      
      Also there were some resource limitation changes that had
      the right intent back in 2005, but were now apparently causing
      needless limitations to people's real use cases; those have
      been relaxed/removed.
      
      There is a lockdep splat fix, but no need for a stable backport,
      since it is virtually impossible to trigger in mainline; you
      have to essentially modify code to force the probabilities
      in your favour to see it.
      
      The rest can largely be categorized as general cleanup of things
      seen in the process of getting the above changes done.
      
      Tested between 64 and 32 bit nodes with the test suite.  I've
      also compile tested all the individual commits on the chain.
      
      I'd originally figured on this queue not being ready for 3.8, but
      the extended stabilization window of 3.7 has changed that.  On
      the other hand, this can still be 3.9 material, if that simply
      works better for folks - no problem for me to defer it to 2013.
      If anyone spots any problems then I'll definitely defer it,
      rather than rush a last minute respin.
      ===================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ba501666
  2. 07 Dec, 2012 36 commits
  3. 06 Dec, 2012 1 commit
    • Erik Hugne's avatar
      tipc: remove obsolete flush of stale reassembly buffer · c0084138
      Erik Hugne authored
      Each link instance has a periodic job checking if there is a stale
      ongoing message reassembly associated to the link. If no new
      fragment has been received during the last 4*[link_tolerance] period,
      it is assumed the missing fragment will never arrive. As a consequence,
      the reassembly buffer is discarded, and a gap in the message sequence
      occurs.
      
      This assumption is wrong. After we abandoned our ambition to develop
      packet routing for multi-cluster networks, only single-hop packet
      transfer remains as an option. For those, all packets are guaranteed
      to be delivered in sequence to the defragmentation layer. Any failure
      to achieve sequenced delivery will eventually lead to link reset, and
      the reassembly buffer will be flushed anyway.
      
      So we just remove this periodic check, which is now obsolete.
      Signed-off-by: default avatarErik Hugne <erik.hugne@ericsson.com>
      Acked-by: default avatarYing Xue <ying.xue@windriver.com>
      Signed-off-by: default avatarJon Maloy <jon.maloy@ericsson.com>
      [PG: also delete get/inc_timer count, since they are now unused]
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      c0084138