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

Commit 10ec34fc 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 BPF filter validation of netlink attribute accesses, from
    Mathias Kruase.

 2) Netfilter conntrack generation seqcount not initialized properly,
    from Andrey Vagin.

 3) Fix comparison mask computation on big-endian in nft_cmp_fast(),
    from Patrick McHardy.

 4) Properly limit MTU over ipv6, from Eric Dumazet.

 5) Fix seccomp system call argument population on 32-bit, from Daniel
    Borkmann.

 6) skb_network_protocol() should not use hard-coded ETH_HLEN, instead
    skb->mac_len needs to be used.  From Vlad Yasevich.

 7) We have several cases of using socket based communications to
    implement a tunnel.  For example, some tunnels are encapsulations
    over UDP so we use an internal kernel UDP socket to do the
    transmits.

    These tunnels should behave just like other software devices and
    pass the packets on down to the next layer.

    Most importantly we want the top-level socket (eg TCP) that created
    the traffic to be charged for the SKB memory.

    However, once you get into the IP output path, we have code that
    assumed that whatever was attached to skb->sk is an IP socket.

    To keep the top-level socket being charged for the SKB memory,
    whilst satisfying the needs of the IP output path, we now pass in an
    explicit 'sk' argument.

    From Eric Dumazet.

 8) ping_init_sock() leaks group info, from Xiaoming Wang.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (33 commits)
  cxgb4: use the correct max size for firmware flash
  qlcnic: Fix MSI-X initialization code
  ip6_gre: don't allow to remove the fb_tunnel_dev
  ipv4: add a sock pointer to dst->output() path.
  ipv4: add a sock pointer to ip_queue_xmit()
  driver/net: cosa driver uses udelay incorrectly
  at86rf230: fix __at86rf230_read_subreg function
  at86rf230: remove check if AVDD settled
  net: cadence: Add architecture dependencies
  net: Start with correct mac_len in skb_network_protocol
  Revert "net: sctp: Fix a_rwnd/rwnd management to reflect real state of the receiver's buffer"
  cxgb4: Save the correct mac addr for hw-loopback connections in the L2T
  net: filter: seccomp: fix wrong decoding of BPF_S_ANC_SECCOMP_LD_W
  seccomp: fix populating a0-a5 syscall args in 32-bit x86 BPF
  qlcnic: Do not disable SR-IOV when VFs are assigned to VMs
  qlcnic: Fix QLogic application/driver interface for virtual NIC configuration
  qlcnic: Fix PVID configuration on eSwitch port.
  qlcnic: Fix max ring count calculation
  qlcnic: Fix to send INIT_NIC_FUNC as first mailbox.
  qlcnic: Fix panic due to uninitialzed delayed_work struct in use.
  ...
parents 55101e2d 6f1d7210

drivers/net/ethernet/broadcom/bnx2.c

+1 −1
Original line number Diff line number Diff line
@@ -8627,6 +8627,7 @@ bnx2_remove_one(struct pci_dev *pdev) 
	pci_disable_device(pdev);

}



#ifdef CONFIG_PM_SLEEP

static int

bnx2_suspend(struct device *device)

{
@@ -8665,7 +8666,6 @@ bnx2_resume(struct device *device) 
	return 0;

}



#ifdef CONFIG_PM_SLEEP

static SIMPLE_DEV_PM_OPS(bnx2_pm_ops, bnx2_suspend, bnx2_resume);

#define BNX2_PM_OPS (&bnx2_pm_ops)

drivers/net/ethernet/cadence/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


config NET_CADENCE

	bool "Cadence devices"

	depends on HAS_IOMEM

	depends on HAS_IOMEM && (ARM || AVR32 || COMPILE_TEST)

	default y

	---help---

	  If you have a network (Ethernet) card belonging to this class, say Y.
@@ -22,7 +22,7 @@ if NET_CADENCE 


config ARM_AT91_ETHER

	tristate "AT91RM9200 Ethernet support"

	depends on HAS_DMA

	depends on HAS_DMA && (ARCH_AT91RM9200 || COMPILE_TEST)

	select MACB

	---help---

	  If you wish to compile a kernel for the AT91RM9200 and enable
@@ -30,7 +30,7 @@ config ARM_AT91_ETHER 


config MACB

	tristate "Cadence MACB/GEM support"

	depends on HAS_DMA

	depends on HAS_DMA && (PLATFORM_AT32AP || ARCH_AT91 || ARCH_PICOXCELL || ARCH_ZYNQ || COMPILE_TEST)

	select PHYLIB

	---help---

	  The Cadence MACB ethernet interface is found on many Atmel AT32 and

drivers/net/ethernet/chelsio/cxgb4/l2t.c

+3 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ static int write_l2e(struct adapter *adap, struct l2t_entry *e, int sync) 
	req->params = htons(L2T_W_PORT(e->lport) | L2T_W_NOREPLY(!sync));

	req->l2t_idx = htons(e->idx);

	req->vlan = htons(e->vlan);

	if (e->neigh)

	if (e->neigh && !(e->neigh->dev->flags & IFF_LOOPBACK))

		memcpy(e->dmac, e->neigh->ha, sizeof(e->dmac));

	memcpy(req->dst_mac, e->dmac, sizeof(req->dst_mac));
@@ -394,6 +394,8 @@ struct l2t_entry *cxgb4_l2t_get(struct l2t_data *d, struct neighbour *neigh, 
	if (e) {

		spin_lock(&e->lock);          /* avoid race with t4_l2t_free */

		e->state = L2T_STATE_RESOLVING;

		if (neigh->dev->flags & IFF_LOOPBACK)

			memcpy(e->dmac, physdev->dev_addr, sizeof(e->dmac));

		memcpy(e->addr, addr, addr_len);

		e->ifindex = ifidx;

		e->hash = hash;

drivers/net/ethernet/chelsio/cxgb4/t4_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -682,7 +682,7 @@ enum { 
	SF_RD_ID        = 0x9f,       /* read ID */

	SF_ERASE_SECTOR = 0xd8,       /* erase sector */



	FW_MAX_SIZE = 512 * 1024,

	FW_MAX_SIZE = 16 * SF_SEC_SIZE,

};



/**

drivers/net/ethernet/emulex/benet/be.h

+1 −0
Original line number Diff line number Diff line
@@ -374,6 +374,7 @@ enum vf_state { 
#define BE_FLAGS_NAPI_ENABLED			(1 << 9)

#define BE_FLAGS_QNQ_ASYNC_EVT_RCVD		(1 << 11)

#define BE_FLAGS_VXLAN_OFFLOADS			(1 << 12)

#define BE_FLAGS_SETUP_DONE			(1 << 13)



#define BE_UC_PMAC_COUNT			30

#define BE_VF_UC_PMAC_COUNT			2