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

Pull networking fixes and cleanups from David Miller:

 1) Revert bogus nla_ok() change, from Alexey Dobriyan.

 2) Various bpf validator fixes from Daniel Borkmann.

 3) Add some necessary SET_NETDEV_DEV() calls to hsis_femac and hip04
    drivers, from Dongpo Li.

 4) Several ethtool ksettings conversions from Philippe Reynes.

 5) Fix bugs in inet port management wrt. soreuseport, from Tom Herbert.

 6) XDP support for virtio_net, from John Fastabend.

 7) Fix NAT handling within a vrf, from David Ahern.

 8) Endianness fixes in dpaa_eth driver, from Claudiu Manoil

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (63 commits)
  net: mv643xx_eth: fix build failure
  isdn: Constify some function parameters
  mlxsw: spectrum: Mark split ports as such
  cgroup: Fix CGROUP_BPF config
  qed: fix old-style function definition
  net: ipv6: check route protocol when deleting routes
  r6040: move spinlock in r6040_close as SOFTIRQ-unsafe lock order detected
  irda: w83977af_ir: cleanup an indent issue
  net: sfc: use new api ethtool_{get|set}_link_ksettings
  net: davicom: dm9000: use new api ethtool_{get|set}_link_ksettings
  net: cirrus: ep93xx: use new api ethtool_{get|set}_link_ksettings
  net: chelsio: cxgb3: use new api ethtool_{get|set}_link_ksettings
  net: chelsio: cxgb2: use new api ethtool_{get|set}_link_ksettings
  bpf: fix mark_reg_unknown_value for spilled regs on map value marking
  bpf: fix overflow in prog accounting
  bpf: dynamically allocate digest scratch buffer
  gtp: Fix initialization of Flags octet in GTPv1 header
  gtp: gtp_check_src_ms_ipv4() always return success
  net/x25: use designated initializers
  isdn: use designated initializers
  ...

7 files changed, 69 insertions, 69 deletions

diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
index aecec6d32463..11e13c56126f 100644
--- a/drivers/isdn/gigaset/bas-gigaset.c
+++ b/drivers/isdn/gigaset/bas-gigaset.c
@@ -2565,22 +2565,22 @@ static int gigaset_post_reset(struct usb_interface *intf)
 
 
 static const struct gigaset_ops gigops = {
-        gigaset_write_cmd,
-        gigaset_write_room,
-        gigaset_chars_in_buffer,
-        gigaset_brkchars,
-        gigaset_init_bchannel,
-        gigaset_close_bchannel,
-        gigaset_initbcshw,
-        gigaset_freebcshw,
-        gigaset_reinitbcshw,
-        gigaset_initcshw,
-        gigaset_freecshw,
-        gigaset_set_modem_ctrl,
-        gigaset_baud_rate,
-        gigaset_set_line_ctrl,
-        gigaset_isoc_send_skb,
-        gigaset_isoc_input,
+        .write_cmd = gigaset_write_cmd,
+        .write_room = gigaset_write_room,
+        .chars_in_buffer = gigaset_chars_in_buffer,
+        .brkchars = gigaset_brkchars,
+        .init_bchannel = gigaset_init_bchannel,
+        .close_bchannel = gigaset_close_bchannel,
+        .initbcshw = gigaset_initbcshw,
+        .freebcshw = gigaset_freebcshw,
+        .reinitbcshw = gigaset_reinitbcshw,
+        .initcshw = gigaset_initcshw,
+        .freecshw = gigaset_freecshw,
+        .set_modem_ctrl = gigaset_set_modem_ctrl,
+        .baud_rate = gigaset_baud_rate,
+        .set_line_ctrl = gigaset_set_line_ctrl,
+        .send_skb = gigaset_isoc_send_skb,
+        .handle_input = gigaset_isoc_input,
 };
 
 /* bas_gigaset_init
diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
index b90776ef56ec..ab0b63a4d045 100644
--- a/drivers/isdn/gigaset/ser-gigaset.c
+++ b/drivers/isdn/gigaset/ser-gigaset.c
@@ -445,22 +445,22 @@ static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
 }
 
 static const struct gigaset_ops ops = {
-        gigaset_write_cmd,
-        gigaset_write_room,
-        gigaset_chars_in_buffer,
-        gigaset_brkchars,
-        gigaset_init_bchannel,
-        gigaset_close_bchannel,
-        gigaset_initbcshw,
-        gigaset_freebcshw,
-        gigaset_reinitbcshw,
-        gigaset_initcshw,
-        gigaset_freecshw,
-        gigaset_set_modem_ctrl,
-        gigaset_baud_rate,
-        gigaset_set_line_ctrl,
-        gigaset_m10x_send_skb,  /* asyncdata.c */
-        gigaset_m10x_input,     /* asyncdata.c */
+        .write_cmd = gigaset_write_cmd,
+        .write_room = gigaset_write_room,
+        .chars_in_buffer = gigaset_chars_in_buffer,
+        .brkchars = gigaset_brkchars,
+        .init_bchannel = gigaset_init_bchannel,
+        .close_bchannel = gigaset_close_bchannel,
+        .initbcshw = gigaset_initbcshw,
+        .freebcshw = gigaset_freebcshw,
+        .reinitbcshw = gigaset_reinitbcshw,
+        .initcshw = gigaset_initcshw,
+        .freecshw = gigaset_freecshw,
+        .set_modem_ctrl = gigaset_set_modem_ctrl,
+        .baud_rate = gigaset_baud_rate,
+        .set_line_ctrl = gigaset_set_line_ctrl,
+        .send_skb = gigaset_m10x_send_skb,      /* asyncdata.c */
+        .handle_input = gigaset_m10x_input,     /* asyncdata.c */
 };
 
 
diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
index 5f306e2eece5..eade36dafa34 100644
--- a/drivers/isdn/gigaset/usb-gigaset.c
+++ b/drivers/isdn/gigaset/usb-gigaset.c
@@ -862,22 +862,22 @@ static int gigaset_pre_reset(struct usb_interface *intf)
 }
 
 static const struct gigaset_ops ops = {
-        gigaset_write_cmd,
-        gigaset_write_room,
-        gigaset_chars_in_buffer,
-        gigaset_brkchars,
-        gigaset_init_bchannel,
-        gigaset_close_bchannel,
-        gigaset_initbcshw,
-        gigaset_freebcshw,
-        gigaset_reinitbcshw,
-        gigaset_initcshw,
-        gigaset_freecshw,
-        gigaset_set_modem_ctrl,
-        gigaset_baud_rate,
-        gigaset_set_line_ctrl,
-        gigaset_m10x_send_skb,
-        gigaset_m10x_input,
+        .write_cmd = gigaset_write_cmd,
+        .write_room = gigaset_write_room,
+        .chars_in_buffer = gigaset_chars_in_buffer,
+        .brkchars = gigaset_brkchars,
+        .init_bchannel = gigaset_init_bchannel,
+        .close_bchannel = gigaset_close_bchannel,
+        .initbcshw = gigaset_initbcshw,
+        .freebcshw = gigaset_freebcshw,
+        .reinitbcshw = gigaset_reinitbcshw,
+        .initcshw = gigaset_initcshw,
+        .freecshw = gigaset_freecshw,
+        .set_modem_ctrl = gigaset_set_modem_ctrl,
+        .baud_rate = gigaset_baud_rate,
+        .set_line_ctrl = gigaset_set_line_ctrl,
+        .send_skb = gigaset_m10x_send_skb,
+        .handle_input = gigaset_m10x_input,
 };
 
 /*
diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c
index bf04d2a3cf4a..2d12c6ceeb89 100644
--- a/drivers/isdn/hisax/config.c
+++ b/drivers/isdn/hisax/config.c
@@ -659,7 +659,7 @@ int jiftime(char *s, long mark)
 
 static u_char tmpbuf[HISAX_STATUS_BUFSIZE];
 
-void VHiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt,
+void VHiSax_putstatus(struct IsdnCardState *cs, char *head, const char *fmt,
                       va_list args)
 {
         /* if head == NULL the fmt contains the full info */
@@ -669,23 +669,24 @@ void VHiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt,
         u_char          *p;
         isdn_ctrl       ic;
         int             len;
+        const u_char    *data;
 
         if (!cs) {
                 printk(KERN_WARNING "HiSax: No CardStatus for message");
                 return;
         }
         spin_lock_irqsave(&cs->statlock, flags);
-        p = tmpbuf;
         if (head) {
+                p = tmpbuf;
                 p += jiftime(p, jiffies);
                 p += sprintf(p, " %s", head);
                 p += vsprintf(p, fmt, args);
                 *p++ = '\n';
                 *p = 0;
                 len = p - tmpbuf;
-                p = tmpbuf;
+                data = tmpbuf;
         } else {
-                p = fmt;
+                data = fmt;
                 len = strlen(fmt);
         }
         if (len > HISAX_STATUS_BUFSIZE) {
@@ -699,13 +700,12 @@ void VHiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt,
         if (i >= len)
                 i = len;
         len -= i;
-        memcpy(cs->status_write, p, i);
+        memcpy(cs->status_write, data, i);
         cs->status_write += i;
         if (cs->status_write > cs->status_end)
                 cs->status_write = cs->status_buf;
-        p += i;
         if (len) {
-                memcpy(cs->status_write, p, len);
+                memcpy(cs->status_write, data + i, len);
                 cs->status_write += len;
         }
 #ifdef KERNELSTACK_DEBUG
@@ -729,7 +729,7 @@ void VHiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt,
         }
 }
 
-void HiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt, ...)
+void HiSax_putstatus(struct IsdnCardState *cs, char *head, const char *fmt, ...)
 {
         va_list args;
 
diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h
index 6ead6314e6d2..338d0408b377 100644
--- a/drivers/isdn/hisax/hisax.h
+++ b/drivers/isdn/hisax/hisax.h
@@ -1288,9 +1288,9 @@ int jiftime(char *s, long mark);
 int HiSax_command(isdn_ctrl *ic);
 int HiSax_writebuf_skb(int id, int chan, int ack, struct sk_buff *skb);
 __printf(3, 4)
-void HiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt, ...);
+void HiSax_putstatus(struct IsdnCardState *cs, char *head, const char *fmt, ...);
 __printf(3, 0)
-void VHiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt, va_list args);
+void VHiSax_putstatus(struct IsdnCardState *cs, char *head, const char *fmt, va_list args);
 void HiSax_reportcard(int cardnr, int sel);
 int QuickHex(char *txt, u_char *p, int cnt);
 void LogFrame(struct IsdnCardState *cs, u_char *p, int size);
diff --git a/drivers/isdn/i4l/isdn_concap.c b/drivers/isdn/i4l/isdn_concap.c
index 91d57304d4d3..336523ec077c 100644
--- a/drivers/isdn/i4l/isdn_concap.c
+++ b/drivers/isdn/i4l/isdn_concap.c
@@ -80,9 +80,9 @@ static int isdn_concap_dl_disconn_req(struct concap_proto *concap)
 }
 
 struct concap_device_ops isdn_concap_reliable_dl_dops = {
-        &isdn_concap_dl_data_req,
-        &isdn_concap_dl_connect_req,
-        &isdn_concap_dl_disconn_req
+        .data_req = &isdn_concap_dl_data_req,
+        .connect_req = &isdn_concap_dl_connect_req,
+        .disconn_req = &isdn_concap_dl_disconn_req
 };
 
 /* The following should better go into a dedicated source file such that
diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c
index 0c5d8de41b23..ba60076e0b95 100644
--- a/drivers/isdn/i4l/isdn_x25iface.c
+++ b/drivers/isdn/i4l/isdn_x25iface.c
@@ -53,14 +53,14 @@ static int isdn_x25iface_disconn_ind(struct concap_proto *);
 
 
 static struct concap_proto_ops ix25_pops = {
-        &isdn_x25iface_proto_new,
-        &isdn_x25iface_proto_del,
-        &isdn_x25iface_proto_restart,
-        &isdn_x25iface_proto_close,
-        &isdn_x25iface_xmit,
-        &isdn_x25iface_receive,
-        &isdn_x25iface_connect_ind,
-        &isdn_x25iface_disconn_ind
+        .proto_new = &isdn_x25iface_proto_new,
+        .proto_del = &isdn_x25iface_proto_del,
+        .restart = &isdn_x25iface_proto_restart,
+        .close = &isdn_x25iface_proto_close,
+        .encap_and_xmit = &isdn_x25iface_xmit,
+        .data_ind = &isdn_x25iface_receive,
+        .connect_ind = &isdn_x25iface_connect_ind,
+        .disconn_ind = &isdn_x25iface_disconn_ind
 };
 
 /* error message helper function */