hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s390/qeth: straighten out fill_buffer() interface 

1. for adjusting the buffer's next_element_to_fill in __fill_buffer(),
   just pass the full qeth_qdio_out_buffer struct
2. when adding a header element, be consistent about passing
   a hint ('is_first_elem') to __fill_buffer()

No functional change.

Signed-off-by: Julian Wiedmann <jwi@linux.vnet.ibm.com>
Acked-by: Ursula Braun <ubraun@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Julian Wiedmann 2017-08-15 17:02:43 +02:00 committed by David S. Miller
parent 5258830bf6
commit 384d2ef145
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/s390/net/qeth_core_main.c
View File

@ -3889,24 +3889,21 @@ int qeth_hdr_chk_and_bounce(struct sk_buff *skb, struct qeth_hdr **hdr, int len)
EXPORT_SYMBOL_GPL(qeth_hdr_chk_and_bounce); EXPORT_SYMBOL_GPL(qeth_hdr_chk_and_bounce);
static inline void __qeth_fill_buffer(struct sk_buff *skb, static inline void __qeth_fill_buffer(struct sk_buff *skb,
struct qdio_buffer *buffer, int is_tso, int *next_element_to_fill, struct qeth_qdio_out_buffer *buf,
int offset) bool is_first_elem, int offset)
{ {
struct qdio_buffer *buffer = buf->buffer;
int element = buf->next_element_to_fill;
int length = skb_headlen(skb); int length = skb_headlen(skb);
int length_here; int length_here, cnt;
int element;
char *data; char *data;
int first_lap, cnt;
struct skb_frag_struct *frag; struct skb_frag_struct *frag;
element = *next_element_to_fill;
data = skb->data; data = skb->data;
first_lap = (is_tso == 0 ? 1 : 0);
if (offset >= 0) { if (offset >= 0) {
data = skb->data + offset; data = skb->data + offset;
length -= offset; length -= offset;
first_lap = 0;
} }
while (length > 0) { while (length > 0) {
@ -3918,7 +3915,8 @@ static inline void __qeth_fill_buffer(struct sk_buff *skb,
buffer->element[element].addr = data; buffer->element[element].addr = data;
buffer->element[element].length = length_here; buffer->element[element].length = length_here;
length -= length_here; length -= length_here;
if (first_lap) { if (is_first_elem) {
is_first_elem = false;
if (length || skb_is_nonlinear(skb)) if (length || skb_is_nonlinear(skb))
/* skb needs additional elements */ /* skb needs additional elements */
buffer->element[element].eflags = buffer->element[element].eflags =
@ -3931,7 +3929,6 @@ static inline void __qeth_fill_buffer(struct sk_buff *skb,
} }
data += length_here; data += length_here;
element++; element++;
first_lap = 0;
} }
for (cnt = 0; cnt < skb_shinfo(skb)->nr_frags; cnt++) { for (cnt = 0; cnt < skb_shinfo(skb)->nr_frags; cnt++) {
@ -3957,7 +3954,7 @@ static inline void __qeth_fill_buffer(struct sk_buff *skb,
if (buffer->element[element - 1].eflags) if (buffer->element[element - 1].eflags)
buffer->element[element - 1].eflags = SBAL_EFLAGS_LAST_FRAG; buffer->element[element - 1].eflags = SBAL_EFLAGS_LAST_FRAG;
*next_element_to_fill = element; buf->next_element_to_fill = element;
} }
static inline int qeth_fill_buffer(struct qeth_qdio_out_q *queue, static inline int qeth_fill_buffer(struct qeth_qdio_out_q *queue,
@ -3965,7 +3962,8 @@ static inline int qeth_fill_buffer(struct qeth_qdio_out_q *queue,
struct qeth_hdr *hdr, int offset, int hd_len) struct qeth_hdr *hdr, int offset, int hd_len)
{ {
struct qdio_buffer *buffer; struct qdio_buffer *buffer;
int flush_cnt = 0, hdr_len, large_send = 0; int flush_cnt = 0, hdr_len;
bool is_first_elem = true;
buffer = buf->buffer; buffer = buf->buffer;
refcount_inc(&skb->users); refcount_inc(&skb->users);
@ -3974,6 +3972,7 @@ static inline int qeth_fill_buffer(struct qeth_qdio_out_q *queue,
/*check first on TSO ....*/ /*check first on TSO ....*/
if (hdr->hdr.l3.id == QETH_HEADER_TYPE_TSO) { if (hdr->hdr.l3.id == QETH_HEADER_TYPE_TSO) {
int element = buf->next_element_to_fill; int element = buf->next_element_to_fill;
is_first_elem = false;
hdr_len = sizeof(struct qeth_hdr_tso) + hdr_len = sizeof(struct qeth_hdr_tso) +
((struct qeth_hdr_tso *)hdr)->ext.dg_hdr_len; ((struct qeth_hdr_tso *)hdr)->ext.dg_hdr_len;
@ -3984,11 +3983,12 @@ static inline int qeth_fill_buffer(struct qeth_qdio_out_q *queue,
buf->next_element_to_fill++; buf->next_element_to_fill++;
skb->data += hdr_len; skb->data += hdr_len;
skb->len -= hdr_len; skb->len -= hdr_len;
large_send = 1;
} }
if (offset >= 0) { if (offset >= 0) {
int element = buf->next_element_to_fill; int element = buf->next_element_to_fill;
is_first_elem = false;
buffer->element[element].addr = hdr; buffer->element[element].addr = hdr;
buffer->element[element].length = sizeof(struct qeth_hdr) + buffer->element[element].length = sizeof(struct qeth_hdr) +
hd_len; hd_len;
@ -3997,8 +3997,7 @@ static inline int qeth_fill_buffer(struct qeth_qdio_out_q *queue,
buf->next_element_to_fill++; buf->next_element_to_fill++;
} }
__qeth_fill_buffer(skb, buffer, large_send, __qeth_fill_buffer(skb, buf, is_first_elem, offset);
(int *)&buf->next_element_to_fill, offset);
if (!queue->do_pack) { if (!queue->do_pack) {
QETH_CARD_TEXT(queue->card, 6, "fillbfnp"); QETH_CARD_TEXT(queue->card, 6, "fillbfnp");