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

Commit 8a04b453 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://github.com/davem330/net 

* git://github.com/davem330/net:
  pch_gbe: Fixed the issue on which a network freezes
  pch_gbe: Fixed the issue on which PC was frozen when link was downed.
  make PACKET_STATISTICS getsockopt report consistently between ring and non-ring
  net: xen-netback: correctly restart Tx after a VM restore/migrate
  bonding: properly stop queuing work when requested
  can bcm: fix incomplete tx_setup fix
  RDSRDMA: Fix cleanup of rds_iw_mr_pool
  net: Documentation: Fix type of variables
  ibmveth: Fix oops on request_irq failure
  ipv6: nullify ipv6_ac_list and ipv6_fl_list when creating new socket
  cxgb4: Fix EEH on IBM P7IOC
  can bcm: fix tx_setup off-by-one errors
  MAINTAINERS: tehuti: Alexander Indenbaum's address bounces
  dp83640: reduce driver noise
  ptp: fix L2 event message recognition
parents a8062e42 805e969f

Documentation/networking/ip-sysctl.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -1042,7 +1042,7 @@ conf/interface/*: 
	The functional behaviour for certain settings is different

	The functional behaviour for certain settings is different

	depending on whether local forwarding is enabled or not.

	depending on whether local forwarding is enabled or not.





accept_ra - BOOLEAN

accept_ra - INTEGER

	Accept Router Advertisements; autoconfigure using them.

	Accept Router Advertisements; autoconfigure using them.





	Possible values are:

	Possible values are:
@@ -1106,7 +1106,7 @@ dad_transmits - INTEGER 
	The amount of Duplicate Address Detection probes to send.

	The amount of Duplicate Address Detection probes to send.

	Default: 1

	Default: 1





forwarding - BOOLEAN

forwarding - INTEGER

	Configure interface-specific Host/Router behaviour.

	Configure interface-specific Host/Router behaviour.





	Note: It is recommended to have the same setting on all

	Note: It is recommended to have the same setting on all

MAINTAINERS

+0 −1
Original line number Original line Diff line number Diff line
@@ -6374,7 +6374,6 @@ S: Supported 
F:	arch/arm/mach-tegra

F:	arch/arm/mach-tegra





TEHUTI ETHERNET DRIVER

TEHUTI ETHERNET DRIVER

M:	Alexander Indenbaum <baum@tehutinetworks.net>

M:	Andy Gospodarek <andy@greyhouse.net>

M:	Andy Gospodarek <andy@greyhouse.net>

L:	netdev@vger.kernel.org

L:	netdev@vger.kernel.org

S:	Supported

S:	Supported

drivers/net/bonding/bond_3ad.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -2168,6 +2168,7 @@ void bond_3ad_state_machine_handler(struct work_struct *work) 
	}

	}





re_arm:

re_arm:

	if (!bond->kill_timers)

		queue_delayed_work(bond->wq, &bond->ad_work, ad_delta_in_ticks);

		queue_delayed_work(bond->wq, &bond->ad_work, ad_delta_in_ticks);

out:

out:

	read_unlock(&bond->lock);

	read_unlock(&bond->lock);

drivers/net/bonding/bond_alb.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -1440,6 +1440,7 @@ void bond_alb_monitor(struct work_struct *work) 
	}

	}





re_arm:

re_arm:

	if (!bond->kill_timers)

		queue_delayed_work(bond->wq, &bond->alb_work, alb_delta_in_ticks);

		queue_delayed_work(bond->wq, &bond->alb_work, alb_delta_in_ticks);

out:

out:

	read_unlock(&bond->lock);

	read_unlock(&bond->lock);

drivers/net/bonding/bond_main.c

+8 −5
Original line number Original line Diff line number Diff line
@@ -777,6 +777,9 @@ static void bond_resend_igmp_join_requests(struct bonding *bond) 




	read_lock(&bond->lock);

	read_lock(&bond->lock);





	if (bond->kill_timers)

		goto out;



	/* rejoin all groups on bond device */

	/* rejoin all groups on bond device */

	__bond_resend_igmp_join_requests(bond->dev);

	__bond_resend_igmp_join_requests(bond->dev);
@@ -790,9 +793,9 @@ static void bond_resend_igmp_join_requests(struct bonding *bond) 
			__bond_resend_igmp_join_requests(vlan_dev);

			__bond_resend_igmp_join_requests(vlan_dev);

	}

	}





	if (--bond->igmp_retrans > 0)

	if ((--bond->igmp_retrans > 0) && !bond->kill_timers)

		queue_delayed_work(bond->wq, &bond->mcast_work, HZ/5);

		queue_delayed_work(bond->wq, &bond->mcast_work, HZ/5);



out:

	read_unlock(&bond->lock);

	read_unlock(&bond->lock);

}

}
@@ -2538,7 +2541,7 @@ void bond_mii_monitor(struct work_struct *work) 
	}

	}





re_arm:

re_arm:

	if (bond->params.miimon)

	if (bond->params.miimon && !bond->kill_timers)

		queue_delayed_work(bond->wq, &bond->mii_work,

		queue_delayed_work(bond->wq, &bond->mii_work,

				   msecs_to_jiffies(bond->params.miimon));

				   msecs_to_jiffies(bond->params.miimon));

out:

out:
@@ -2886,7 +2889,7 @@ void bond_loadbalance_arp_mon(struct work_struct *work) 
	}

	}





re_arm:

re_arm:

	if (bond->params.arp_interval)

	if (bond->params.arp_interval && !bond->kill_timers)

		queue_delayed_work(bond->wq, &bond->arp_work, delta_in_ticks);

		queue_delayed_work(bond->wq, &bond->arp_work, delta_in_ticks);

out:

out:

	read_unlock(&bond->lock);

	read_unlock(&bond->lock);
@@ -3154,7 +3157,7 @@ void bond_activebackup_arp_mon(struct work_struct *work) 
	bond_ab_arp_probe(bond);

	bond_ab_arp_probe(bond);





re_arm:

re_arm:

	if (bond->params.arp_interval)

	if (bond->params.arp_interval && !bond->kill_timers)

		queue_delayed_work(bond->wq, &bond->arp_work, delta_in_ticks);

		queue_delayed_work(bond->wq, &bond->arp_work, delta_in_ticks);

out:

out:

	read_unlock(&bond->lock);

	read_unlock(&bond->lock);