Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de8856d2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from David Miller:
 1) Name string overrun fix in gianfar driver from Joe Perches.

 2) VHOST bug fixes from Michael S. Tsirkin and Nadav Har'El

 3) Fix dependencies on xt_LOG netfilter module, from Pablo Neira Ayuso.

 4) Fix RCU locking in xt_CT, also from Pablo Neira Ayuso.

 5) Add a parameter to skb_add_rx_frag() so we can fix the truesize
    adjustments in the drivers that use it.  The individual drivers
    aren't fixed by this commit, but will be dealt with using follow-on
    commits.  From Eric Dumazet.

 6) Add some device IDs to qmi_wwan driver, from Andrew Bird.

 7) Fix a potential rcu_read_lock() imbalancein rt6_fill_node().  From
    Eric Dumazet.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  net: fix a potential rcu_read_lock() imbalance in rt6_fill_node()
  net: add a truesize parameter to skb_add_rx_frag()
  gianfar: Fix possible overrun and simplify interrupt name field creation
  USB: qmi_wwan: Add ZTE (Vodafone) K3570-Z and K3571-Z net interfaces
  USB: option: Ignore ZTE (Vodafone) K3570/71 net interfaces
  USB: qmi_wwan: Add ZTE (Vodafone) K3565-Z and K4505-Z net interfaces
  qlcnic: Bug fix for LRO
  netfilter: nf_conntrack: permanently attach timeout policy to conntrack
  netfilter: xt_CT: fix assignation of the generic protocol tracker
  netfilter: xt_CT: missing rcu_read_lock section in timeout assignment
  netfilter: cttimeout: fix dependency with l4protocol conntrack module
  netfilter: xt_LOG: use CONFIG_IP6_NF_IPTABLES instead of CONFIG_IPV6
  vhost: fix release path lockdep checks
  vhost: don't forget to schedule()
  tools/virtio: stub out strong barriers
  tools/virtio: add linux/hrtimer.h stub
  tools/virtio: add linux/module.h stub
parents 66f03c61 94f826b8

drivers/net/ethernet/freescale/gianfar.c

+7 −32
Original line number Diff line number Diff line
@@ -968,7 +968,6 @@ static int gfar_probe(struct platform_device *ofdev) 
	struct gfar_private *priv = NULL;

	struct gfar __iomem *regs = NULL;

	int err = 0, i, grp_idx = 0;

	int len_devname;

	u32 rstat = 0, tstat = 0, rqueue = 0, tqueue = 0;

	u32 isrg = 0;

	u32 __iomem *baddr;
@@ -1169,40 +1168,16 @@ static int gfar_probe(struct platform_device *ofdev) 
		priv->device_flags & FSL_GIANFAR_DEV_HAS_MAGIC_PACKET);



	/* fill out IRQ number and name fields */

	len_devname = strlen(dev->name);

	for (i = 0; i < priv->num_grps; i++) {

		strncpy(&priv->gfargrp[i].int_name_tx[0], dev->name,

				len_devname);

		if (priv->device_flags & FSL_GIANFAR_DEV_HAS_MULTI_INTR) {

			strncpy(&priv->gfargrp[i].int_name_tx[len_devname],

				"_g", sizeof("_g"));

			priv->gfargrp[i].int_name_tx[

				strlen(priv->gfargrp[i].int_name_tx)] = i+48;

			strncpy(&priv->gfargrp[i].int_name_tx[strlen(

				priv->gfargrp[i].int_name_tx)],

				"_tx", sizeof("_tx") + 1);



			strncpy(&priv->gfargrp[i].int_name_rx[0], dev->name,

					len_devname);

			strncpy(&priv->gfargrp[i].int_name_rx[len_devname],

					"_g", sizeof("_g"));

			priv->gfargrp[i].int_name_rx[

				strlen(priv->gfargrp[i].int_name_rx)] = i+48;

			strncpy(&priv->gfargrp[i].int_name_rx[strlen(

				priv->gfargrp[i].int_name_rx)],

				"_rx", sizeof("_rx") + 1);



			strncpy(&priv->gfargrp[i].int_name_er[0], dev->name,

					len_devname);

			strncpy(&priv->gfargrp[i].int_name_er[len_devname],

				"_g", sizeof("_g"));

			priv->gfargrp[i].int_name_er[strlen(

					priv->gfargrp[i].int_name_er)] = i+48;

			strncpy(&priv->gfargrp[i].int_name_er[strlen(\

				priv->gfargrp[i].int_name_er)],

				"_er", sizeof("_er") + 1);

			sprintf(priv->gfargrp[i].int_name_tx, "%s%s%c%s",

				dev->name, "_g", '0' + i, "_tx");

			sprintf(priv->gfargrp[i].int_name_rx, "%s%s%c%s",

				dev->name, "_g", '0' + i, "_rx");

			sprintf(priv->gfargrp[i].int_name_er, "%s%s%c%s",

				dev->name, "_g", '0' + i, "_er");

		} else

			priv->gfargrp[i].int_name_tx[len_devname] = '\0';

			strcpy(priv->gfargrp[i].int_name_tx, dev->name);

	}



	/* Initialize the filer table */

drivers/net/ethernet/freescale/gianfar.h

+1 −1
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ extern const char gfar_driver_version[]; 
#define RXFCB_PERR_MASK		0x000c

#define RXFCB_PERR_BADL3	0x0008



#define GFAR_INT_NAME_MAX	IFNAMSIZ + 4

#define GFAR_INT_NAME_MAX	(IFNAMSIZ + 6)	/* '_g#_xx' */



struct txbd8

{

drivers/net/ethernet/qlogic/qlcnic/qlcnic.h

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ 


#define _QLCNIC_LINUX_MAJOR 5

#define _QLCNIC_LINUX_MINOR 0

#define _QLCNIC_LINUX_SUBVERSION 25

#define QLCNIC_LINUX_VERSIONID  "5.0.26"

#define _QLCNIC_LINUX_SUBVERSION 27

#define QLCNIC_LINUX_VERSIONID  "5.0.27"

#define QLCNIC_DRV_IDC_VER  0x01

#define QLCNIC_DRIVER_VERSION  ((_QLCNIC_LINUX_MAJOR << 16) |\

		 (_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION))

drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c

+3 −1
Original line number Diff line number Diff line
@@ -1458,8 +1458,10 @@ qlcnic_reset_context(struct qlcnic_adapter *adapter) 


		if (netif_running(netdev)) {

			err = qlcnic_attach(adapter);

			if (!err)

			if (!err) {

				__qlcnic_up(adapter, netdev);

				qlcnic_restore_indev_addr(netdev, NETDEV_UP);

			}

		}



		netif_device_attach(netdev);

drivers/net/usb/cdc-phonet.c

+4 −2
Original line number Diff line number Diff line
@@ -164,12 +164,14 @@ static void rx_complete(struct urb *req) 
				/* Can't use pskb_pull() on page in IRQ */

				memcpy(skb_put(skb, 1), page_address(page), 1);

				skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags,

						page, 1, req->actual_length);

						page, 1, req->actual_length,

						req->actual_length);

				page = NULL;

			}

		} else {

			skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags,

					page, 0, req->actual_length);

					page, 0, req->actual_length,

					req->actual_length);

			page = NULL;

		}

		if (req->actual_length < PAGE_SIZE)