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

Commit 4ac4d584 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) The wireless rate info fix from Johannes Berg.

 2) When a RAW socket is in hdrincl mode, we need to make sure that the
    user provided at least a minimally sized ipv4/ipv6 header. Fix from
    Alexander Potapenko.

 3) We must emit IFLA_PHYS_PORT_NAME netlink attributes using
    nla_put_string() so that it is NULL terminated.

 4) Fix a bug in TCP fastopen handling, wherein child sockets
    erroneously inherit the fastopen_req from the parent, and later can
    end up derefencing freed memory or doing a double free. From Eric
    Dumazet.

 5) Don't clear out netdev stats at close time in tg3 driver, from
    YueHaibing.

 6) Fix refcount leak in xt_CT, from Gao Feng.

 7) In nft_set_bitmap() don't leak dummy elements, from Liping Zhang.

 8) Fix deadlock due to taking the expectation lock twice, also from
    Liping Zhang.

 9) Make xt_socket work again with ipv6, from Peter Tirsek.

10) Don't allow IPV6 to be used with IPVS if ipv6.disable=1, from Paolo
    Abeni.

11) Make the BPF loader more flexible wrt. changes to the bpf MAP entry
    layout. From Jesper Dangaard Brouer.

12) Fix ethtool reported device name in aquantia driver, from Pavel
    Belous.

13) Fix build failures due to the compile time size test not working in
    netfilter conntrack. From Geert Uytterhoeven.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (52 commits)
  cfg80211: make RATE_INFO_BW_20 the default
  ipv6: initialize route null entry in addrconf_init()
  qede: Fix possible misconfiguration of advertised autoneg value.
  qed: Fix overriding of supported autoneg value.
  qed*: Fix possible overflow for status block id field.
  rtnetlink: NUL-terminate IFLA_PHYS_PORT_NAME string
  netvsc: make sure napi enabled before vmbus_open
  aquantia: Fix driver name reported by ethtool
  ipv4, ipv6: ensure raw socket message is big enough to hold an IP header
  net/sched: remove redundant null check on head
  tcp: do not inherit fastopen_req from parent
  forcedeth: remove unnecessary carrier status check
  ibmvnic: Move queue restarting in ibmvnic_tx_complete
  ibmvnic: Record SKB RX queue during poll
  ibmvnic: Continue skb processing after skb completion error
  ibmvnic: Check for driver reset first in ibmvnic_xmit
  ibmvnic: Wait for any pending scrqs entries at driver close
  ibmvnic: Clean up tx pools when closing
  ibmvnic: Whitespace correction in release_rx_pools
  ibmvnic: Delete napi's when releasing driver resources
  ...
parents 8d5e72df 842be75c

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -8782,14 +8782,16 @@ F: drivers/net/ethernet/neterion/ 
NETFILTER

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

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

M:	Florian Westphal <fw@strlen.de>

L:	netfilter-devel@vger.kernel.org

L:	coreteam@netfilter.org

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

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

W:	http://www.nftables.org/

Q:	http://patchwork.ozlabs.org/project/netfilter-devel/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git

S:	Supported

S:	Maintained

F:	include/linux/netfilter*

F:	include/linux/netfilter/

F:	include/net/netfilter/

drivers/net/ethernet/aquantia/atlantic/aq_cfg.h

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ 


#define AQ_CFG_DRV_AUTHOR      "aQuantia"

#define AQ_CFG_DRV_DESC        "aQuantia Corporation(R) Network Driver"

#define AQ_CFG_DRV_NAME        "aquantia"

#define AQ_CFG_DRV_NAME        "atlantic"

#define AQ_CFG_DRV_VERSION	__stringify(NIC_MAJOR_DRIVER_VERSION)"."\

				__stringify(NIC_MINOR_DRIVER_VERSION)"."\

				__stringify(NIC_BUILD_DRIVER_VERSION)"."\

drivers/net/ethernet/broadcom/tg3.c

+0 −4
Original line number Diff line number Diff line
@@ -11729,10 +11729,6 @@ static int tg3_close(struct net_device *dev) 


	tg3_stop(tp);



	/* Clear stats across close / open calls */

	memset(&tp->net_stats_prev, 0, sizeof(tp->net_stats_prev));

	memset(&tp->estats_prev, 0, sizeof(tp->estats_prev));



	if (pci_device_is_present(tp->pdev)) {

		tg3_power_down_prepare(tp);

drivers/net/ethernet/ibm/ibmvnic.c

+363 −198

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/ibm/ibmvnic.h

+25 −6
Original line number Diff line number Diff line
@@ -913,6 +913,25 @@ struct ibmvnic_error_buff { 
	__be32 error_id;

};



enum vnic_state {VNIC_PROBING = 1,

		 VNIC_PROBED,

		 VNIC_OPENING,

		 VNIC_OPEN,

		 VNIC_CLOSING,

		 VNIC_CLOSED,

		 VNIC_REMOVING,

		 VNIC_REMOVED};



enum ibmvnic_reset_reason {VNIC_RESET_FAILOVER = 1,

			   VNIC_RESET_MOBILITY,

			   VNIC_RESET_FATAL,

			   VNIC_RESET_TIMEOUT};



struct ibmvnic_rwi {

	enum ibmvnic_reset_reason reset_reason;

	struct list_head list;

};



struct ibmvnic_adapter {

	struct vio_dev *vdev;

	struct net_device *netdev;
@@ -922,7 +941,6 @@ struct ibmvnic_adapter { 
	dma_addr_t ip_offload_tok;

	struct ibmvnic_control_ip_offload_buffer ip_offload_ctrl;

	dma_addr_t ip_offload_ctrl_tok;

	bool migrated;

	u32 msg_enable;



	/* Statistics */
@@ -962,7 +980,6 @@ struct ibmvnic_adapter { 
	u64 promisc;



	struct ibmvnic_tx_pool *tx_pool;

	bool closing;

	struct completion init_done;

	int init_done_rc;
@@ -1007,9 +1024,11 @@ struct ibmvnic_adapter { 
	__be64 tx_rx_desc_req;

	u8 map_id;



	struct work_struct vnic_crq_init;

	struct work_struct ibmvnic_xport;

	struct tasklet_struct tasklet;

	bool failover;

	bool is_closed;

	enum vnic_state state;

	enum ibmvnic_reset_reason reset_reason;

	struct mutex reset_lock, rwi_lock;

	struct list_head rwi_list;

	struct work_struct ibmvnic_reset;

	bool resetting;

};