diff options
| author | Paul Durrant <Paul.Durrant@citrix.com> | 2014-03-28 11:39:05 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-04-30 16:23:17 +0100 |
| commit | 4399eeb660a1fc58c4dddaece8ce779841f83ecb (patch) | |
| tree | 61d507a01f452bcc7e56af038f696f3171e57fbd /drivers/net | |
| parent | 4334fca3512d179726666ad18459965916a1f189 (diff) | |
| download | kernel_samsung_smdk4412-4399eeb660a1fc58c4dddaece8ce779841f83ecb.zip kernel_samsung_smdk4412-4399eeb660a1fc58c4dddaece8ce779841f83ecb.tar.gz kernel_samsung_smdk4412-4399eeb660a1fc58c4dddaece8ce779841f83ecb.tar.bz2 | |
xen-netback: remove pointless clause from if statement
[ Upstream commit 0576eddf24df716d8570ef8ca11452a9f98eaab2 ]
This patch removes a test in start_new_rx_buffer() that checks whether
a copy operation is less than MAX_BUFFER_OFFSET in length, since
MAX_BUFFER_OFFSET is defined to be PAGE_SIZE and the only caller of
start_new_rx_buffer() already limits copy operations to PAGE_SIZE or less.
Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
Cc: Sander Eikelenboom <linux@eikelenboom.it>
Reported-By: Sander Eikelenboom <linux@eikelenboom.it>
Tested-By: Sander Eikelenboom <linux@eikelenboom.it>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/xen-netback/netback.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c index 9a4626c..b2528f6 100644 --- a/drivers/net/xen-netback/netback.c +++ b/drivers/net/xen-netback/netback.c @@ -346,8 +346,8 @@ static bool start_new_rx_buffer(int offset, unsigned long size, int head) * into multiple copies tend to give large frags their * own buffers as before. */ - if ((offset + size > MAX_BUFFER_OFFSET) && - (size <= MAX_BUFFER_OFFSET) && offset && !head) + BUG_ON(size > MAX_BUFFER_OFFSET); + if ((offset + size > MAX_BUFFER_OFFSET) && offset && !head) return true; return false; |