Commit 4cf75621 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from David Miller:
 "Another batch of fixes:

  1) Remove nft_compat counter flush optimization, it generates warnings
     from the refcount infrastructure. From Florian Westphal.

  2) Fix BPF to search for build id more robustly, from Jiri Olsa.

  3) Handle bogus getopt lengths in ebtables, from Florian Westphal.

  4) Infoleak and other fixes to j1939 CAN driver, from Eric Dumazet and
     Oleksij Rempel.

  5) Reset iter properly on mptcp sendmsg() error, from Florian
     Westphal.

  6) Show a saner speed in bonding broadcast mode, from Jarod Wilson.

  7) Various kerneldoc fixes in bonding and elsewhere, from Lee Jones.

  8) Fix double unregister in bonding during namespace tear down, from
     Cong Wang.

  9) Disable RP filter during icmp_redirect selftest, from David Ahern"

* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (75 commits)
  otx2_common: Use devm_kcalloc() in otx2_config_npa()
  net: qrtr: fix usage of idr in port assignment to socket
  selftests: disable rp_filter for icmp_redirect.sh
  Revert "net: xdp: pull ethernet header off packet after computing skb->protocol"
  phylink: <linux/phylink.h>: fix function prototype kernel-doc warning
  mptcp: sendmsg: reset iter on error redux
  net: devlink: Remove overzealous WARN_ON with snapshots
  tipc: not enable tipc when ipv6 works as a module
  tipc: fix uninit skb->data in tipc_nl_compat_dumpit()
  net: Fix potential wrong skb->protocol in skb_vlan_untag()
  net: xdp: pull ethernet header off packet after computing skb->protocol
  ipvlan: fix device features
  bonding: fix a potential double-unregister
  can: j1939: add rxtimer for multipacket broadcast session
  can: j1939: abort multipacket broadcast session when timeout occurs
  can: j1939: cancel rxtimer on multipacket broadcast session complete
  can: j1939: fix support for multipacket broadcast message
  net: fddi: skfp: cfm: Remove seemingly unused variable 'ID_sccs'
  net: fddi: skfp: cfm: Remove set but unused variable 'oldstate'
  net: fddi: skfp: smt: Remove seemingly unused variable 'ID_sccs'
  ...
parents 29e44f45 bf2bcd6f

Documentation/bpf/index.rst

+7 −0
Original line number Diff line number Diff line
@@ -36,6 +36,12 @@ Two sets of Questions and Answers (Q&A) are maintained. 
   bpf_devel_QA





Helper functions

================



* `bpf-helpers(7)`_ maintains a list of helpers available to eBPF programs.





Program types

=============
@@ -79,4 +85,5 @@ Other 
.. _networking-filter: ../networking/filter.rst

.. _man-pages: https://www.kernel.org/doc/man-pages/

.. _bpf(2): https://man7.org/linux/man-pages/man2/bpf.2.html

.. _bpf-helpers(7): https://man7.org/linux/man-pages/man7/bpf-helpers.7.html

.. _BPF and XDP Reference Guide: https://docs.cilium.io/en/latest/bpf/

Documentation/networking/bonding.rst

+0 −18
Original line number Diff line number Diff line
@@ -2860,17 +2860,6 @@ version of the linux kernel, found on http://kernel.org 
The latest version of this document can be found in the latest kernel

source (named Documentation/networking/bonding.rst).



Discussions regarding the usage of the bonding driver take place on the

bonding-devel mailing list, hosted at sourceforge.net. If you have questions or

problems, post them to the list.  The list address is:



bonding-devel@lists.sourceforge.net



The administrative interface (to subscribe or unsubscribe) can

be found at:



https://lists.sourceforge.net/lists/listinfo/bonding-devel



Discussions regarding the development of the bonding driver take place

on the main Linux network mailing list, hosted at vger.kernel.org. The list

address is:
@@ -2881,10 +2870,3 @@ The administrative interface (to subscribe or unsubscribe) can 
be found at:



http://vger.kernel.org/vger-lists.html#netdev
 


Donald Becker's Ethernet Drivers and diag programs may be found at :



 - http://web.archive.org/web/%2E/http://www.scyld.com/network/



You will also find a lot of information regarding Ethernet, NWay, MII,

etc. at www.scyld.com.

drivers/net/bonding/bond_3ad.c

+8 −7
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static inline struct bonding *__get_bond_by_port(struct port *port) 


/**

 * __get_first_agg - get the first aggregator in the bond

 * @bond: the bond we're looking at

 * @port: the port we're looking at

 *

 * Return the aggregator of the first slave in @bond, or %NULL if it can't be

 * found.
@@ -1626,7 +1626,7 @@ static int agg_device_up(const struct aggregator *agg) 


/**

 * ad_agg_selection_logic - select an aggregation group for a team

 * @aggregator: the aggregator we're looking at

 * @agg: the aggregator we're looking at

 * @update_slave_arr: Does slave array need update?

 *

 * It is assumed that only one aggregator may be selected for a team.
@@ -1810,7 +1810,7 @@ static void ad_initialize_agg(struct aggregator *aggregator) 


/**

 * ad_initialize_port - initialize a given port's parameters

 * @aggregator: the aggregator we're looking at

 * @port: the port we're looking at

 * @lacp_fast: boolean. whether fast periodic should be used

 */

static void ad_initialize_port(struct port *port, int lacp_fast)
@@ -1967,6 +1967,7 @@ static void ad_marker_response_received(struct bond_marker *marker, 
/**

 * bond_3ad_initiate_agg_selection - initate aggregator selection

 * @bond: bonding struct

 * @timeout: timeout value to set

 *

 * Set the aggregation selection timer, to initiate an agg selection in

 * the very near future.  Called during first initialization, and during
@@ -2259,7 +2260,7 @@ void bond_3ad_update_ad_actor_settings(struct bonding *bond) 


/**

 * bond_3ad_state_machine_handler - handle state machines timeout

 * @bond: bonding struct to work on

 * @work: work context to fetch bonding struct to work on from

 *

 * The state machine handling concept in this module is to check every tick

 * which state machine should operate any function. The execution order is
@@ -2500,7 +2501,7 @@ void bond_3ad_adapter_speed_duplex_changed(struct slave *slave) 
/**

 * bond_3ad_handle_link_change - handle a slave's link status change indication

 * @slave: slave struct to work on

 * @status: whether the link is now up or down

 * @link: whether the link is now up or down

 *

 * Handle reselection of aggregator (if needed) for this port.

 */
@@ -2551,7 +2552,7 @@ void bond_3ad_handle_link_change(struct slave *slave, char link) 


/**

 * bond_3ad_set_carrier - set link state for bonding master

 * @bond - bonding structure

 * @bond: bonding structure

 *

 * if we have an active aggregator, we're up, if not, we're down.

 * Presumes that we cannot have an active aggregator if there are
@@ -2664,7 +2665,7 @@ int bond_3ad_lacpdu_recv(const struct sk_buff *skb, struct bonding *bond, 


/**

 * bond_3ad_update_lacp_rate - change the lacp rate

 * @bond - bonding struct

 * @bond: bonding struct

 *

 * When modify lacp_rate parameter via sysfs,

 * update actor_oper_port_state of each port.

drivers/net/bonding/bond_alb.c

+2 −2
Original line number Diff line number Diff line
@@ -1206,8 +1206,8 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav 


/**

 * alb_set_mac_address

 * @bond:

 * @addr:

 * @bond: bonding we're working on

 * @addr: MAC address to set

 *

 * In TLB mode all slaves are configured to the bond's hw address, but set

 * their dev_addr field to different addresses (based on their permanent hw

drivers/net/bonding/bond_main.c

+23 −5
Original line number Diff line number Diff line
@@ -322,6 +322,7 @@ netdev_tx_t bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, 
/**

 * bond_vlan_rx_add_vid - Propagates adding an id to slaves

 * @bond_dev: bonding net device that got called

 * @proto: network protocol ID

 * @vid: vlan id being added

 */

static int bond_vlan_rx_add_vid(struct net_device *bond_dev,
@@ -355,6 +356,7 @@ unwind: 
/**

 * bond_vlan_rx_kill_vid - Propagates deleting an id to slaves

 * @bond_dev: bonding net device that got called

 * @proto: network protocol ID

 * @vid: vlan id being removed

 */

static int bond_vlan_rx_kill_vid(struct net_device *bond_dev,
@@ -948,7 +950,7 @@ static bool bond_should_notify_peers(struct bonding *bond) 
/**

 * change_active_interface - change the active slave into the specified one

 * @bond: our bonding struct

 * @new: the new slave to make the active one

 * @new_active: the new slave to make the active one

 *

 * Set the new slave to the bond's settings and unset them on the old

 * curr_active_slave.
@@ -2205,7 +2207,8 @@ static int bond_release_and_destroy(struct net_device *bond_dev, 
	int ret;



	ret = __bond_release_one(bond_dev, slave_dev, false, true);

	if (ret == 0 && !bond_has_slaves(bond)) {

	if (ret == 0 && !bond_has_slaves(bond) &&

	    bond_dev->reg_state != NETREG_UNREGISTERING) {

		bond_dev->priv_flags |= IFF_DISABLE_NETPOLL;

		netdev_info(bond_dev, "Destroying bond\n");

		bond_remove_proc_entry(bond);
@@ -4552,13 +4555,23 @@ static netdev_tx_t bond_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	return ret;

}



static u32 bond_mode_bcast_speed(struct slave *slave, u32 speed)

{

	if (speed == 0 || speed == SPEED_UNKNOWN)

		speed = slave->speed;

	else

		speed = min(speed, slave->speed);



	return speed;

}



static int bond_ethtool_get_link_ksettings(struct net_device *bond_dev,

					   struct ethtool_link_ksettings *cmd)

{

	struct bonding *bond = netdev_priv(bond_dev);

	unsigned long speed = 0;

	struct list_head *iter;

	struct slave *slave;

	u32 speed = 0;



	cmd->base.duplex = DUPLEX_UNKNOWN;

	cmd->base.port = PORT_OTHER;
@@ -4570,8 +4583,13 @@ static int bond_ethtool_get_link_ksettings(struct net_device *bond_dev, 
	 */

	bond_for_each_slave(bond, slave, iter) {

		if (bond_slave_can_tx(slave)) {

			if (slave->speed != SPEED_UNKNOWN)

			if (slave->speed != SPEED_UNKNOWN) {

				if (BOND_MODE(bond) == BOND_MODE_BROADCAST)

					speed = bond_mode_bcast_speed(slave,

								      speed);

				else

					speed += slave->speed;

			}

			if (cmd->base.duplex == DUPLEX_UNKNOWN &&

			    slave->duplex != DUPLEX_UNKNOWN)

				cmd->base.duplex = slave->duplex;

CRA Git | Maintained and supported by SUSTech CRA and CCSE