Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Signed-off-by: David S. Miller <davem@davemloft.net>

4 files changed, 17 insertions, 23 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 8be38675e1a8..d030575532a2 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -7129,11 +7129,11 @@ static int dev_cpu_callback(struct notifier_block *nfb,
 
         /* Process offline CPU's input_pkt_queue */
         while ((skb = __skb_dequeue(&oldsd->process_queue))) {
-                netif_rx_internal(skb);
+                netif_rx_ni(skb);
                 input_queue_head_incr(oldsd);
         }
         while ((skb = skb_dequeue(&oldsd->input_pkt_queue))) {
-                netif_rx_internal(skb);
+                netif_rx_ni(skb);
                 input_queue_head_incr(oldsd);
         }
 
diff --git a/net/core/flow.c b/net/core/flow.c
index a0348fde1fdf..1033725be40b 100644
--- a/net/core/flow.c
+++ b/net/core/flow.c
@@ -379,7 +379,7 @@ done:
 static void flow_cache_flush_task(struct work_struct *work)
 {
         struct netns_xfrm *xfrm = container_of(work, struct netns_xfrm,
-                                                flow_cache_gc_work);
+                                                flow_cache_flush_work);
         struct net *net = container_of(xfrm, struct net, xfrm);
 
         flow_cache_flush(net);
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index da934fc3faa8..9fa25b0ea145 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -2842,25 +2842,25 @@ static struct sk_buff *fill_packet_ipv4(struct net_device *odev,
         skb->dev = odev;
         skb->pkt_type = PACKET_HOST;
 
+        pktgen_finalize_skb(pkt_dev, skb, datalen);
+
         if (!(pkt_dev->flags & F_UDPCSUM)) {
                 skb->ip_summed = CHECKSUM_NONE;
         } else if (odev->features & NETIF_F_V4_CSUM) {
                 skb->ip_summed = CHECKSUM_PARTIAL;
                 skb->csum = 0;
-                udp4_hwcsum(skb, udph->source, udph->dest);
+                udp4_hwcsum(skb, iph->saddr, iph->daddr);
         } else {
-                __wsum csum = udp_csum(skb);
+                __wsum csum = skb_checksum(skb, skb_transport_offset(skb), datalen + 8, 0);
 
                 /* add protocol-dependent pseudo-header */
-                udph->check = csum_tcpudp_magic(udph->source, udph->dest,
+                udph->check = csum_tcpudp_magic(iph->saddr, iph->daddr,
                                                 datalen + 8, IPPROTO_UDP, csum);
 
                 if (udph->check == 0)
                         udph->check = CSUM_MANGLED_0;
         }
 
-        pktgen_finalize_skb(pkt_dev, skb, datalen);
-
 #ifdef CONFIG_XFRM
         if (!process_ipsec(pkt_dev, skb, protocol))
                 return NULL;
@@ -2976,6 +2976,8 @@ static struct sk_buff *fill_packet_ipv6(struct net_device *odev,
         skb->dev = odev;
         skb->pkt_type = PACKET_HOST;
 
+        pktgen_finalize_skb(pkt_dev, skb, datalen);
+
         if (!(pkt_dev->flags & F_UDPCSUM)) {
                 skb->ip_summed = CHECKSUM_NONE;
         } else if (odev->features & NETIF_F_V6_CSUM) {
@@ -2984,7 +2986,7 @@ static struct sk_buff *fill_packet_ipv6(struct net_device *odev,
                 skb->csum_offset = offsetof(struct udphdr, check);
                 udph->check = ~csum_ipv6_magic(&iph->saddr, &iph->daddr, udplen, IPPROTO_UDP, 0);
         } else {
-                __wsum csum = udp_csum(skb);
+                __wsum csum = skb_checksum(skb, skb_transport_offset(skb), udplen, 0);
 
                 /* add protocol-dependent pseudo-header */
                 udph->check = csum_ipv6_magic(&iph->saddr, &iph->daddr, udplen, IPPROTO_UDP, csum);
@@ -2993,8 +2995,6 @@ static struct sk_buff *fill_packet_ipv6(struct net_device *odev,
                         udph->check = CSUM_MANGLED_0;
         }
 
-        pktgen_finalize_skb(pkt_dev, skb, datalen);
-
         return skb;
 }
 
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 5dad4f782f03..5be499b6a2d2 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1263,18 +1263,12 @@ static const struct nla_policy ifla_vfinfo_policy[IFLA_VF_INFO_MAX+1] = {
 };
 
 static const struct nla_policy ifla_vf_policy[IFLA_VF_MAX+1] = {
-        [IFLA_VF_MAC]           = { .type = NLA_BINARY,
-                                    .len = sizeof(struct ifla_vf_mac) },
-        [IFLA_VF_VLAN]          = { .type = NLA_BINARY,
-                                    .len = sizeof(struct ifla_vf_vlan) },
-        [IFLA_VF_TX_RATE]       = { .type = NLA_BINARY,
-                                    .len = sizeof(struct ifla_vf_tx_rate) },
-        [IFLA_VF_SPOOFCHK]      = { .type = NLA_BINARY,
-                                    .len = sizeof(struct ifla_vf_spoofchk) },
-        [IFLA_VF_RATE]          = { .type = NLA_BINARY,
-                                    .len = sizeof(struct ifla_vf_rate) },
-        [IFLA_VF_LINK_STATE]    = { .type = NLA_BINARY,
-                                    .len = sizeof(struct ifla_vf_link_state) },
+        [IFLA_VF_MAC]           = { .len = sizeof(struct ifla_vf_mac) },
+        [IFLA_VF_VLAN]          = { .len = sizeof(struct ifla_vf_vlan) },
+        [IFLA_VF_TX_RATE]       = { .len = sizeof(struct ifla_vf_tx_rate) },
+        [IFLA_VF_SPOOFCHK]      = { .len = sizeof(struct ifla_vf_spoofchk) },
+        [IFLA_VF_RATE]          = { .len = sizeof(struct ifla_vf_rate) },
+        [IFLA_VF_LINK_STATE]    = { .len = sizeof(struct ifla_vf_link_state) },
 };
 
 static const struct nla_policy ifla_port_policy[IFLA_PORT_MAX+1] = {