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

Commit f40ede39 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) Fix crash in ipvs tot_stats estimator, from Julian Anastasov.

 2) Fix OOPS in nf_nat on netns removal, from Florian Westphal.

 3) Really really really fix locking issues in slip and slcan tty write
    wakeups, from Tyler Hall.

 4) Fix checksum offloading in fec driver, from Fugang Duan.

 5) Off by one in BPF instruction limit test, from Kees Cook.

 6) Need to clear all TSO capability flags when doing software TSO in
    tg3 driver, from Prashant Sreedharan.

 7) Fix memory leak in vlan_reorder_header() error path, from Li
    RongQing.

 8) Fix various bugs in xen-netfront and xen-netback multiqueue support,
    from David Vrabel and Wei Liu.

 9) Fix deadlock in cxgb4 driver, from Li RongQing.

10) Prevent double free of no-cache DST entries, from Eric Dumazet.

11) Bad csum_start handling in skb_segment() leads to crashes when
    forwarding, from Tom Herbert.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (76 commits)
  net: fix setting csum_start in skb_segment()
  ipv4: fix dst race in sk_dst_get()
  net: filter: Use kcalloc/kmalloc_array to allocate arrays
  trivial: net: filter: Change kerneldoc parameter order
  trivial: net: filter: Fix typo in comment
  net: allwinner: emac: Add missing free_irq
  cxgb4: use dev_port to identify ports
  xen-netback: bookkeep number of active queues in our own module
  tg3: Change nvram command timeout value to 50ms
  cxgb4: Not need to hold the adap_rcu_lock lock when read adap_rcu_list
  be2net: fix qnq mode detection on VFs
  of: mdio: fixup of_phy_register_fixed_link parsing of new bindings
  at86rf230: fix irq setup
  net: phy: at803x: fix coccinelle warnings
  net/mlx4_core: Fix the error flow when probing with invalid VF configuration
  tulip: Poll link status more frequently for Comet chips
  net: huawei_cdc_ncm: increase command buffer size
  drivers: net: cpsw: fix dual EMAC stall when connected to same switch
  xen-netfront: recreate queues correctly when reconnecting
  xen-netfront: fix oops when disconnected from backend
  ...
parents ec71feae de843723

Documentation/ptp/testptp.c

+4 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
 *  along with this program; if not, write to the Free Software

 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 */

#define _GNU_SOURCE

#include <errno.h>

#include <fcntl.h>

#include <inttypes.h>
@@ -46,12 +47,14 @@ 
#define CLOCK_INVALID -1

#endif



/* When glibc offers the syscall, this will go away. */

/* clock_adjtime is not available in GLIBC < 2.14 */

#if !__GLIBC_PREREQ(2, 14)

#include <sys/syscall.h>

static int clock_adjtime(clockid_t id, struct timex *tx)

{

	return syscall(__NR_clock_adjtime, id, tx);

}

#endif



static clockid_t get_clockid(int fd)

{

MAINTAINERS

+1 −10
Original line number Diff line number Diff line
@@ -3189,14 +3189,6 @@ L: linux-scsi@vger.kernel.org 
S:	Maintained

F:	drivers/scsi/eata_pio.*



EBTABLES

L:	netfilter-devel@vger.kernel.org

W:	http://ebtables.sourceforge.net/

S:	Orphan

F:	include/linux/netfilter_bridge/ebt_*.h

F:	include/uapi/linux/netfilter_bridge/ebt_*.h

F:	net/bridge/netfilter/ebt*.c



EC100 MEDIA DRIVER

M:	Antti Palosaari <crope@iki.fi>

L:	linux-media@vger.kernel.org
@@ -6105,12 +6097,11 @@ F: Documentation/networking/s2io.txt 
F:	Documentation/networking/vxge.txt

F:	drivers/net/ethernet/neterion/



NETFILTER/IPTABLES

NETFILTER ({IP,IP6,ARP,EB,NF}TABLES)

M:	Pablo Neira Ayuso <pablo@netfilter.org>

M:	Patrick McHardy <kaber@trash.net>

M:	Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>

L:	netfilter-devel@vger.kernel.org

L:	netfilter@vger.kernel.org

L:	coreteam@netfilter.org

W:	http://www.netfilter.org/

W:	http://www.iptables.org/

drivers/isdn/hisax/Kconfig

+1 −10
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ config ISDN_DRV_HISAX 
	  also to the configuration option of the driver for your particular

	  card, below.



if ISDN_DRV_HISAX!=n

if ISDN_DRV_HISAX



comment "D-channel protocol features"
@@ -348,10 +348,6 @@ config HISAX_ENTERNOW_PCI 
	  This enables HiSax support for the Formula-n enter:now PCI

	  ISDN card.



endif



if ISDN_DRV_HISAX



config HISAX_DEBUG

	bool "HiSax debugging"

	help
@@ -420,11 +416,6 @@ config HISAX_FRITZ_PCIPNP 
	  (the latter also needs you to select "ISA Plug and Play support"

	  from the menu "Plug and Play configuration")



config HISAX_AVM_A1_PCMCIA

	bool

	depends on HISAX_AVM_A1_CS

	default y



endif



endmenu

drivers/net/bonding/bond_main.c

+9 −0
Original line number Diff line number Diff line
@@ -1025,10 +1025,14 @@ static netdev_features_t bond_fix_features(struct net_device *dev, 
				 NETIF_F_FRAGLIST | NETIF_F_ALL_TSO | \

				 NETIF_F_HIGHDMA | NETIF_F_LRO)



#define BOND_ENC_FEATURES	(NETIF_F_ALL_CSUM | NETIF_F_SG | NETIF_F_RXCSUM |\

				 NETIF_F_TSO | NETIF_F_GSO_UDP_TUNNEL)



static void bond_compute_features(struct bonding *bond)

{

	unsigned int flags, dst_release_flag = IFF_XMIT_DST_RELEASE;

	netdev_features_t vlan_features = BOND_VLAN_FEATURES;

	netdev_features_t enc_features  = BOND_ENC_FEATURES;

	struct net_device *bond_dev = bond->dev;

	struct list_head *iter;

	struct slave *slave;
@@ -1044,6 +1048,9 @@ static void bond_compute_features(struct bonding *bond) 
		vlan_features = netdev_increment_features(vlan_features,

			slave->dev->vlan_features, BOND_VLAN_FEATURES);



		enc_features = netdev_increment_features(enc_features,

							 slave->dev->hw_enc_features,

							 BOND_ENC_FEATURES);

		dst_release_flag &= slave->dev->priv_flags;

		if (slave->dev->hard_header_len > max_hard_header_len)

			max_hard_header_len = slave->dev->hard_header_len;
@@ -1054,6 +1061,7 @@ static void bond_compute_features(struct bonding *bond) 


done:

	bond_dev->vlan_features = vlan_features;

	bond_dev->hw_enc_features = enc_features;

	bond_dev->hard_header_len = max_hard_header_len;

	bond_dev->gso_max_segs = gso_max_segs;

	netif_set_gso_max_size(bond_dev, gso_max_size);
@@ -3975,6 +3983,7 @@ void bond_setup(struct net_device *bond_dev) 
				NETIF_F_HW_VLAN_CTAG_FILTER;



	bond_dev->hw_features &= ~(NETIF_F_ALL_CSUM & ~NETIF_F_HW_CSUM);

	bond_dev->hw_features |= NETIF_F_GSO_UDP_TUNNEL;

	bond_dev->features |= bond_dev->hw_features;

}

drivers/net/can/slcan.c

+27 −10
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
#include <linux/delay.h>

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/workqueue.h>

#include <linux/can.h>

#include <linux/can/skb.h>
@@ -85,6 +86,7 @@ struct slcan { 
	struct tty_struct	*tty;		/* ptr to TTY structure	     */

	struct net_device	*dev;		/* easy for intr handling    */

	spinlock_t		lock;

	struct work_struct	tx_work;	/* Flushes transmit buffer   */



	/* These are pointers to the malloc()ed frame buffers. */

	unsigned char		rbuff[SLC_MTU];	/* receiver buffer	     */
@@ -309,36 +311,46 @@ static void slc_encaps(struct slcan *sl, struct can_frame *cf) 
	sl->dev->stats.tx_bytes += cf->can_dlc;

}



/*

 * Called by the driver when there's room for more data.  If we have

 * more packets to send, we send them here.

 */

static void slcan_write_wakeup(struct tty_struct *tty)

/* Write out any remaining transmit buffer. Scheduled when tty is writable */

static void slcan_transmit(struct work_struct *work)

{

	struct slcan *sl = container_of(work, struct slcan, tx_work);

	int actual;

	struct slcan *sl = (struct slcan *) tty->disc_data;



	spin_lock_bh(&sl->lock);

	/* First make sure we're connected. */

	if (!sl || sl->magic != SLCAN_MAGIC || !netif_running(sl->dev))

	if (!sl->tty || sl->magic != SLCAN_MAGIC || !netif_running(sl->dev)) {

		spin_unlock_bh(&sl->lock);

		return;

	}



	spin_lock_bh(&sl->lock);

	if (sl->xleft <= 0)  {

		/* Now serial buffer is almost free & we can start

		 * transmission of another packet */

		sl->dev->stats.tx_packets++;

		clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);

		clear_bit(TTY_DO_WRITE_WAKEUP, &sl->tty->flags);

		spin_unlock_bh(&sl->lock);

		netif_wake_queue(sl->dev);

		return;

	}



	actual = tty->ops->write(tty, sl->xhead, sl->xleft);

	actual = sl->tty->ops->write(sl->tty, sl->xhead, sl->xleft);

	sl->xleft -= actual;

	sl->xhead += actual;

	spin_unlock_bh(&sl->lock);

}



/*

 * Called by the driver when there's room for more data.

 * Schedule the transmit.

 */

static void slcan_write_wakeup(struct tty_struct *tty)

{

	struct slcan *sl = tty->disc_data;



	schedule_work(&sl->tx_work);

}



/* Send a can_frame to a TTY queue. */

static netdev_tx_t slc_xmit(struct sk_buff *skb, struct net_device *dev)

{
@@ -528,6 +540,7 @@ static struct slcan *slc_alloc(dev_t line) 
	sl->magic = SLCAN_MAGIC;

	sl->dev	= dev;

	spin_lock_init(&sl->lock);

	INIT_WORK(&sl->tx_work, slcan_transmit);

	slcan_devs[i] = dev;



	return sl;
@@ -626,8 +639,12 @@ static void slcan_close(struct tty_struct *tty) 
	if (!sl || sl->magic != SLCAN_MAGIC || sl->tty != tty)

		return;



	spin_lock_bh(&sl->lock);

	tty->disc_data = NULL;

	sl->tty = NULL;

	spin_unlock_bh(&sl->lock);



	flush_work(&sl->tx_work);



	/* Flush network side */

	unregister_netdev(sl->dev);