The patch titled
netpoll: initialize skb for UDP
has been removed from the -mm tree. Its filename is
netpoll-initialize-skb-for-udp.patch
This patch was dropped because it had testing failures
------------------------------------------------------
Subject: netpoll: initialize skb for UDP
From: Stephen Hemminger <shemminger@xxxxxxxx>
Need to fully initialize skb to keep lower layers and queueing happy.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
net/core/netpoll.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff -puN net/core/netpoll.c~netpoll-initialize-skb-for-udp net/core/netpoll.c
--- a/net/core/netpoll.c~netpoll-initialize-skb-for-udp
+++ a/net/core/netpoll.c
@@ -335,13 +335,13 @@ void netpoll_send_udp(struct netpoll *np
memcpy(skb->data, msg, len);
skb->len += len;
- udph = (struct udphdr *) skb_push(skb, sizeof(*udph));
+ skb->h.uh = udph = (struct udphdr *) skb_push(skb, sizeof(*udph));
udph->source = htons(np->local_port);
udph->dest = htons(np->remote_port);
udph->len = htons(udp_len);
udph->check = 0;
- iph = (struct iphdr *)skb_push(skb, sizeof(*iph));
+ skb->nh.iph = iph = (struct iphdr *)skb_push(skb, sizeof(*iph));
/* iph->version = 4; iph->ihl = 5; */
put_unaligned(0x45, (unsigned char *)iph);
@@ -357,8 +357,8 @@ void netpoll_send_udp(struct netpoll *np
iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl);
eth = (struct ethhdr *) skb_push(skb, ETH_HLEN);
-
- eth->h_proto = htons(ETH_P_IP);
+ skb->mac.raw = skb->data;
+ skb->protocol = eth->h_proto = htons(ETH_P_IP);
memcpy(eth->h_source, np->local_mac, 6);
memcpy(eth->h_dest, np->remote_mac, 6);
_
Patches currently in -mm which might be from shemminger@xxxxxxxx are
origin.patch
git-netdev-all.patch
bonding-lockdep-annotation.patch
netpoll-initialize-skb-for-udp.patch
netpoll-rework-skb-transmit-queue.patch
netpoll-use-skb_buff_head-for-skb-cache.patch
netpoll-retry-memory-leak.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
