From: David S. Miller Date: Sat, 29 Mar 2014 22:52:04 +0000 (-0400) Subject: Merge branch 'xen-netback' X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=df69491b7d1550137507a7eb5f2fc5dce0c1e534;p=deliverable%2Flinux.git Merge branch 'xen-netback' Paul Durrant says: ==================== xen-netback: fix rx slot estimation Sander Eikelenboom reported an issue with ring overflow in netback in 3.14-rc3. This turns outo be be because of a bug in the ring slot estimation code. This patch series fixes the slot estimation, fixes the BUG_ON() that was supposed to catch the issue that Sander ran into and also makes a small fix to start_new_rx_buffer(). v3: - Added a cap of MAX_SKB_FRAGS to estimate in patch #2 v2: - Added BUG_ON() to patch #1 - Added more explanation to patch #3 ==================== Reported-By: Sander Eikelenboom Tested-By: Sander Eikelenboom Acked-by: Ian Campbell Signed-off-by: David S. Miller --- df69491b7d1550137507a7eb5f2fc5dce0c1e534