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

Commit 184ca823 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) Buffers powersave frame test is reversed in cfg80211, fix from Felix
    Fietkau.

 2) Remove bogus WARN_ON in openvswitch, from Jarno Rajahalme.

 3) Fix some tg3 ethtool logic bugs, and one that would cause no
    interrupts to be generated when rx-coalescing is set to 0.  From
    Satish Baddipadige and Siva Reddy Kallam.

 4) QLCNIC mailbox corruption and napi budget handling fix from Manish
    Chopra.

 5) Fix fib_trie logic when walking the trie during /proc/net/route
    output than can access a stale node pointer.  From David Forster.

 6) Several sctp_diag fixes from Phil Sutter.

 7) PAUSE frame handling fixes in mlxsw driver from Ido Schimmel.

 8) Checksum fixup fixes in bpf from Daniel Borkmann.

 9) Memork leaks in nfnetlink, from Liping Zhang.

10) Use after free in rxrpc, from David Howells.

11) Use after free in new skb_array code of macvtap driver, from Jason
    Wang.

12) Calipso resource leak, from Colin Ian King.

13) mediatek bug fixes (missing stats sync init, etc.) from Sean Wang.

14) Fix bpf non-linear packet write helpers, from Daniel Borkmann.

15) Fix lockdep splats in macsec, from Sabrina Dubroca.

16) hv_netvsc bug fixes from Vitaly Kuznetsov, mostly to do with VF
    handling.

17) Various tc-action bug fixes, from CONG Wang.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (116 commits)
  net_sched: allow flushing tc police actions
  net_sched: unify the init logic for act_police
  net_sched: convert tcf_exts from list to pointer array
  net_sched: move tc offload macros to pkt_cls.h
  net_sched: fix a typo in tc_for_each_action()
  net_sched: remove an unnecessary list_del()
  net_sched: remove the leftover cleanup_a()
  mlxsw: spectrum: Allow packets to be trapped from any PG
  mlxsw: spectrum: Unmap 802.1Q FID before destroying it
  mlxsw: spectrum: Add missing rollbacks in error path
  mlxsw: reg: Fix missing op field fill-up
  mlxsw: spectrum: Trap loop-backed packets
  mlxsw: spectrum: Add missing packet traps
  mlxsw: spectrum: Mark port as active before registering it
  mlxsw: spectrum: Create PVID vPort before registering netdevice
  mlxsw: spectrum: Remove redundant errors from the code
  mlxsw: spectrum: Don't return upon error in removal path
  i40e: check for and deal with non-contiguous TCs
  ixgbe: Re-enable ability to toggle VLAN filtering
  ixgbe: Force VLNCTRL.VFE to be set in all VMDq paths
  ...
parents 5ff132c0 b96c22c0

Documentation/networking/rxrpc.txt

+11 −10
Original line number Diff line number Diff line
@@ -790,13 +790,12 @@ The kernel interface functions are as follows: 
     Data messages can have their contents extracted with the usual bunch of

     socket buffer manipulation functions.  A data message can be determined to

     be the last one in a sequence with rxrpc_kernel_is_data_last().  When a

     data message has been used up, rxrpc_kernel_data_delivered() should be

     called on it..

     data message has been used up, rxrpc_kernel_data_consumed() should be

     called on it.



     Non-data messages should be handled to rxrpc_kernel_free_skb() to dispose

     of.  It is possible to get extra refs on all types of message for later

     freeing, but this may pin the state of a call until the message is finally

     freed.

     Messages should be handled to rxrpc_kernel_free_skb() to dispose of.  It

     is possible to get extra refs on all types of message for later freeing,

     but this may pin the state of a call until the message is finally freed.



 (*) Accept an incoming call.
@@ -821,12 +820,14 @@ The kernel interface functions are as follows: 
     Other errors may be returned if the call had been aborted (-ECONNABORTED)

     or had timed out (-ETIME).



 (*) Record the delivery of a data message and free it.

 (*) Record the delivery of a data message.



	void rxrpc_kernel_data_delivered(struct sk_buff *skb);

	void rxrpc_kernel_data_consumed(struct rxrpc_call *call,

					struct sk_buff *skb);



     This is used to record a data message as having been delivered and to

     update the ACK state for the call.  The socket buffer will be freed.

     This is used to record a data message as having been consumed and to

     update the ACK state for the call.  The message must still be passed to

     rxrpc_kernel_free_skb() for disposal by the caller.



 (*) Free a message.

drivers/net/bonding/bond_main.c

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ module_param(lacp_rate, charp, 0); 
MODULE_PARM_DESC(lacp_rate, "LACPDU tx rate to request from 802.3ad partner; "

			    "0 for slow, 1 for fast");

module_param(ad_select, charp, 0);

MODULE_PARM_DESC(ad_select, "803.ad aggregation selection logic; "

MODULE_PARM_DESC(ad_select, "802.3ad aggregation selection logic; "

			    "0 for stable (default), 1 for bandwidth, "

			    "2 for count");

module_param(min_links, int, 0);

drivers/net/dsa/b53/b53_regs.h

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ 
 * BCM5325 and BCM5365 share most definitions below

 */

#define B53_ARLTBL_MAC_VID_ENTRY(n)	(0x10 * (n))

#define   ARLTBL_MAC_MASK		0xffffffffffff

#define   ARLTBL_MAC_MASK		0xffffffffffffULL

#define   ARLTBL_VID_S			48

#define   ARLTBL_VID_MASK_25		0xff

#define   ARLTBL_VID_MASK		0xfff

drivers/net/dsa/mv88e6xxx/chip.c

+2 −0
Original line number Diff line number Diff line
@@ -3187,6 +3187,7 @@ static int mv88e6xxx_set_addr(struct dsa_switch *ds, u8 *addr) 
	return err;

}



#ifdef CONFIG_NET_DSA_HWMON

static int mv88e6xxx_mdio_page_read(struct dsa_switch *ds, int port, int page,

				    int reg)

{
@@ -3212,6 +3213,7 @@ static int mv88e6xxx_mdio_page_write(struct dsa_switch *ds, int port, int page, 


	return ret;

}

#endif



static int mv88e6xxx_port_to_mdio_addr(struct mv88e6xxx_chip *chip, int port)

{

drivers/net/ethernet/apm/xgene/xgene_enet_hw.c

+2 −0
Original line number Diff line number Diff line
@@ -793,6 +793,8 @@ int xgene_enet_phy_connect(struct net_device *ndev) 
			netdev_err(ndev, "Could not connect to PHY\n");

			return  -ENODEV;

		}

#else

		return -ENODEV;

#endif

	}