summaryrefslogtreecommitdiffstats
path: root/net/unix
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-12-10 21:19:42 -0500
committerDavid S. Miller <davem@davemloft.net>2013-12-10 21:19:42 -0500
commit88b07b3660362049769f36c94f2c5a623424c992 (patch)
treeaea353293cb6dd720813f0f7259ce7dd6f7eba07 /net/unix
parente9c56f8d2f851fb6d6ce6794c0f5463b862a878e (diff)
parent6b294b8efedaa7cf7507154148e2c79766ad6f96 (diff)
downloadop-kernel-dev-88b07b3660362049769f36c94f2c5a623424c992.zip
op-kernel-dev-88b07b3660362049769f36c94f2c5a623424c992.tar.gz
Merge branch 'sfc-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc
Ben Hutchings says: ==================== Several fixes for the PTP hardware support added in 3.7: 1. Fix filtering of PTP packets on the TX path to be robust against bad header lengths. 2. Limit logging on the RX path in case of a PTP packet flood, partly from Laurence Evans. 3. Disable PTP hardware when the interface is down so that we don't receive RX timestamp events, from Alexandre Rames. 4. Maintain clock frequency adjustment when a time offset is applied. Also fixes for the SFC9100 family support added in 3.12: 5. Take the RX prefix length into account when applying NET_IP_ALIGN, from Andrew Rybchenko. 6. Work around a bug that breaks communication between the driver and firmware, from Robert Stonehouse. Please also queue these up for the appropriate stable branches. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/unix')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud