system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-03 09:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

s390/qeth: use mm helpers

Browse source 
Slightly reduce the complexity of the core xmit path, by replacing some
open-coded logic with the corresponding helpers.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Julian Wiedmann 2019-06-11 18:37:49 +02:00 committed by David S. Miller
parent e8b1116118
commit 4e2fe4edca
1 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
drivers/s390/net/qeth_core_main.c
View file

@ -20,6 +20,7 @@
#include <linux/ip.h> #include <linux/ip.h>
#include <linux/tcp.h> #include <linux/tcp.h>
#include <linux/mii.h> #include <linux/mii.h>
#include <linux/mm.h>
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
@ -3723,8 +3724,8 @@ static int qeth_add_hw_header(struct qeth_qdio_out_q *queue,
__elements = 1 + qeth_count_elements(skb, proto_len); __elements = 1 + qeth_count_elements(skb, proto_len);
else else
__elements = qeth_count_elements(skb, 0); __elements = qeth_count_elements(skb, 0);
} else if (!proto_len && qeth_get_elements_for_range(start, end) == 1) { } else if (!proto_len && PAGE_ALIGNED(skb->data)) {
/* Push HW header into a new page. */ /* Push HW header into preceding page, flush with skb->data. */
push_ok = true; push_ok = true;
__elements = 1 + qeth_count_elements(skb, 0); __elements = 1 + qeth_count_elements(skb, 0);
} else { } else {
@ -3778,18 +3779,16 @@ static void __qeth_fill_buffer(struct sk_buff *skb,
int element = buf->next_element_to_fill; int element = buf->next_element_to_fill;
int length = skb_headlen(skb) - offset; int length = skb_headlen(skb) - offset;
char *data = skb->data + offset; char *data = skb->data + offset;
int length_here, cnt; unsigned int elem_length, cnt;
/* map linear part into buffer element(s) */ /* map linear part into buffer element(s) */
while (length > 0) { while (length > 0) {
/* length_here is the remaining amount of data in this page */ elem_length = min_t(unsigned int, length,
length_here = PAGE_SIZE - ((unsigned long) data % PAGE_SIZE); PAGE_SIZE - offset_in_page(data));
if (length < length_here)
length_here = length;
buffer->element[element].addr = data; buffer->element[element].addr = data;
buffer->element[element].length = length_here; buffer->element[element].length = elem_length;
length -= length_here; length -= elem_length;
if (is_first_elem) { if (is_first_elem) {
is_first_elem = false; is_first_elem = false;
if (length || skb_is_nonlinear(skb)) if (length || skb_is_nonlinear(skb))
@ -3802,7 +3801,8 @@ static void __qeth_fill_buffer(struct sk_buff *skb,
buffer->element[element].eflags = buffer->element[element].eflags =
SBAL_EFLAGS_MIDDLE_FRAG; SBAL_EFLAGS_MIDDLE_FRAG;
} }
data += length_here;
data += elem_length;
element++; element++;
} }
@ -3813,17 +3813,16 @@ static void __qeth_fill_buffer(struct sk_buff *skb,
data = skb_frag_address(frag); data = skb_frag_address(frag);
length = skb_frag_size(frag); length = skb_frag_size(frag);
while (length > 0) { while (length > 0) {
length_here = PAGE_SIZE - elem_length = min_t(unsigned int, length,
((unsigned long) data % PAGE_SIZE); PAGE_SIZE - offset_in_page(data));
if (length < length_here)
length_here = length;
buffer->element[element].addr = data; buffer->element[element].addr = data;
buffer->element[element].length = length_here; buffer->element[element].length = elem_length;
buffer->element[element].eflags = buffer->element[element].eflags =
SBAL_EFLAGS_MIDDLE_FRAG; SBAL_EFLAGS_MIDDLE_FRAG;
length -= length_here;
data += length_here; length -= elem_length;
data += elem_length;
element++; element++;
} }
} }