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

Commit ff33952e 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 object leak on IPSEC offload failure, from Steffen Klassert.

 2) Fix range checks in ipset address range addition operations, from
    Jozsef Kadlecsik.

 3) Fix pernet ops unregistration order in ipset, from Florian Westphal.

 4) Add missing netlink attribute policy for nl80211 packet pattern
    attrs, from Peng Xu.

 5) Fix PPP device destruction race, from Guillaume Nault.

 6) Write marks get lost when BPF verifier processes R1=R2 register
    assignments, causing incorrect liveness information and less state
    pruning. Fix from Alexei Starovoitov.

 7) Fix blockhole routes so that they are marked dead and therefore not
    cached in sockets, otherwise IPSEC stops working. From Steffen
    Klassert.

 8) Fix broadcast handling of UDP socket early demux, from Paolo Abeni.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (37 commits)
  cdc_ether: flag the u-blox TOBY-L2 and SARA-U2 as wwan
  net: thunderx: mark expected switch fall-throughs in nicvf_main()
  udp: fix bcast packet reception
  netlink: do not set cb_running if dump's start() errs
  ipv4: Fix traffic triggered IPsec connections.
  ipv6: Fix traffic triggered IPsec connections.
  ixgbe: incorrect XDP ring accounting in ethtool tx_frame param
  net: ixgbe: Use new PCI_DEV_FLAGS_NO_RELAXED_ORDERING flag
  Revert commit 1a8b6d76 ("net:add one common config...")
  ixgbe: fix masking of bits read from IXGBE_VXLANCTRL register
  ixgbe: Return error when getting PHY address if PHY access is not supported
  netfilter: xt_bpf: Fix XT_BPF_MODE_FD_PINNED mode of 'xt_bpf_info_v1'
  netfilter: SYNPROXY: skip non-tcp packet in {ipv4, ipv6}_synproxy_hook
  tipc: Unclone message at secondary destination lookup
  tipc: correct initialization of skb list
  gso: fix payload length when gso_size is zero
  mlxsw: spectrum_router: Avoid expensive lookup during route removal
  bpf: fix liveness marking
  doc: Fix typo "8023.ad" in bonding documentation
  ipv6: fix net.ipv6.conf.all.accept_dad behaviour for real
  ...
parents 68ebe3cb fdfbad32

Documentation/networking/bonding.txt

+1 −1
Original line number Diff line number Diff line
@@ -2387,7 +2387,7 @@ broadcast: Like active-backup, there is not much advantage to this 
	and packet type ID), so in a "gatewayed" configuration, all

	outgoing traffic will generally use the same device.  Incoming

	traffic may also end up on a single device, but that is

	dependent upon the balancing policy of the peer's 8023.ad

	dependent upon the balancing policy of the peer's 802.3ad

	implementation.  In a "local" configuration, traffic will be

	distributed across the devices in the bond.

arch/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -937,9 +937,6 @@ config STRICT_MODULE_RWX 
	  and non-text memory will be made non-executable. This provides

	  protection against certain security exploits (e.g. writing to text)



config ARCH_WANT_RELAX_ORDER

	bool



config ARCH_HAS_REFCOUNT

	bool

	help

arch/sparc/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ config SPARC 
	select ARCH_HAS_SG_CHAIN

	select CPU_NO_EFFICIENT_FFS

	select LOCKDEP_SMALL if LOCKDEP

	select ARCH_WANT_RELAX_ORDER



config SPARC32

	def_bool !64BIT

drivers/net/ethernet/cavium/thunder/nicvf_main.c

+2 −0
Original line number Diff line number Diff line
@@ -565,8 +565,10 @@ static inline bool nicvf_xdp_rx(struct nicvf *nic, struct bpf_prog *prog, 
		return true;

	default:

		bpf_warn_invalid_xdp_action(action);

		/* fall through */

	case XDP_ABORTED:

		trace_xdp_exception(nic->netdev, prog, action);

		/* fall through */

	case XDP_DROP:

		/* Check if it's a recycled page, if not

		 * unmap the DMA mapping.

drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c

+0 −22
Original line number Diff line number Diff line
@@ -175,31 +175,9 @@ static s32 ixgbe_init_phy_ops_82598(struct ixgbe_hw *hw) 
 **/

static s32 ixgbe_start_hw_82598(struct ixgbe_hw *hw)

{

#ifndef CONFIG_SPARC

	u32 regval;

	u32 i;

#endif

	s32 ret_val;



	ret_val = ixgbe_start_hw_generic(hw);



#ifndef CONFIG_SPARC

	/* Disable relaxed ordering */

	for (i = 0; ((i < hw->mac.max_tx_queues) &&

	     (i < IXGBE_DCA_MAX_QUEUES_82598)); i++) {

		regval = IXGBE_READ_REG(hw, IXGBE_DCA_TXCTRL(i));

		regval &= ~IXGBE_DCA_TXCTRL_DESC_WRO_EN;

		IXGBE_WRITE_REG(hw, IXGBE_DCA_TXCTRL(i), regval);

	}



	for (i = 0; ((i < hw->mac.max_rx_queues) &&

	     (i < IXGBE_DCA_MAX_QUEUES_82598)); i++) {

		regval = IXGBE_READ_REG(hw, IXGBE_DCA_RXCTRL(i));

		regval &= ~(IXGBE_DCA_RXCTRL_DATA_WRO_EN |

			    IXGBE_DCA_RXCTRL_HEAD_WRO_EN);

		IXGBE_WRITE_REG(hw, IXGBE_DCA_RXCTRL(i), regval);

	}

#endif

	if (ret_val)

		return ret_val;