projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SK_BUFF]: Convert skb->tail to sk_buff_data_t
[deliverable/linux.git]
/
drivers
/
s390
/
net
/
netiucv.c
diff --git
a/drivers/s390/net/netiucv.c
b/drivers/s390/net/netiucv.c
index 6387b483f2bfe32fb7c7875fa28fe5b742222e67..cd42bd54988cd9645de2fcc902e8ea5274b80e14 100644
(file)
--- a/
drivers/s390/net/netiucv.c
+++ b/
drivers/s390/net/netiucv.c
@@
-41,7
+41,6
@@
#include <linux/types.h>
#include <linux/interrupt.h>
#include <linux/timer.h>
#include <linux/types.h>
#include <linux/interrupt.h>
#include <linux/timer.h>
-#include <linux/sched.h>
#include <linux/bitops.h>
#include <linux/signal.h>
#include <linux/bitops.h>
#include <linux/signal.h>
@@
-636,7
+635,7
@@
static void netiucv_unpack_skb(struct iucv_connection *conn,
return;
}
skb_put(pskb, header->next);
return;
}
skb_put(pskb, header->next);
-
pskb->mac.raw = pskb->data
;
+
skb_reset_mac_header(pskb)
;
skb = dev_alloc_skb(pskb->len);
if (!skb) {
PRINT_WARN("%s Out of memory in netiucv_unpack_skb\n",
skb = dev_alloc_skb(pskb->len);
if (!skb) {
PRINT_WARN("%s Out of memory in netiucv_unpack_skb\n",
@@
-647,7
+646,7
@@
static void netiucv_unpack_skb(struct iucv_connection *conn,
return;
}
memcpy(skb_put(skb, pskb->len), pskb->data, pskb->len);
return;
}
memcpy(skb_put(skb, pskb->len), pskb->data, pskb->len);
- skb
->mac.raw = skb->data
;
+ skb
_reset_mac_header(skb)
;
skb->dev = pskb->dev;
skb->protocol = pskb->protocol;
pskb->ip_summed = CHECKSUM_UNNECESSARY;
skb->dev = pskb->dev;
skb->protocol = pskb->protocol;
pskb->ip_summed = CHECKSUM_UNNECESSARY;
@@
-690,7
+689,8
@@
static void conn_action_rx(fsm_instance *fi, int event, void *arg)
msg->length, conn->max_buffsize);
return;
}
msg->length, conn->max_buffsize);
return;
}
- conn->rx_buff->data = conn->rx_buff->tail = conn->rx_buff->head;
+ conn->rx_buff->data = conn->rx_buff->head;
+ skb_reset_tail_pointer(conn->rx_buff);
conn->rx_buff->len = 0;
rc = iucv_message_receive(conn->path, msg, 0, conn->rx_buff->data,
msg->length, NULL);
conn->rx_buff->len = 0;
rc = iucv_message_receive(conn->path, msg, 0, conn->rx_buff->data,
msg->length, NULL);
@@
-736,7
+736,8
@@
static void conn_action_txdone(fsm_instance *fi, int event, void *arg)
}
}
}
}
}
}
- conn->tx_buff->data = conn->tx_buff->tail = conn->tx_buff->head;
+ conn->tx_buff->data = conn->tx_buff->head;
+ skb_reset_tail_pointer(conn->tx_buff);
conn->tx_buff->len = 0;
spin_lock_irqsave(&conn->collect_lock, saveflags);
while ((skb = skb_dequeue(&conn->collect_queue))) {
conn->tx_buff->len = 0;
spin_lock_irqsave(&conn->collect_lock, saveflags);
while ((skb = skb_dequeue(&conn->collect_queue))) {
@@
-1165,8
+1166,8
@@
static int netiucv_transmit_skb(struct iucv_connection *conn,
* Copy the skb to a new allocated skb in lowmem only if the
* data is located above 2G in memory or tailroom is < 2.
*/
* Copy the skb to a new allocated skb in lowmem only if the
* data is located above 2G in memory or tailroom is < 2.
*/
- unsigned long hi =
-
((unsigned long)(skb->tail +
NETIUCV_HDRLEN)) >> 31;
+ unsigned long hi =
((unsigned long)(skb_tail_pointer(skb) +
+
NETIUCV_HDRLEN)) >> 31;
int copied = 0;
if (hi || (skb_tailroom(skb) < 2)) {
nskb = alloc_skb(skb->len + NETIUCV_HDRLEN +
int copied = 0;
if (hi || (skb_tailroom(skb) < 2)) {
nskb = alloc_skb(skb->len + NETIUCV_HDRLEN +
This page took
0.026717 seconds
and
5
git commands to generate.