mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 17:08:10 +00:00
b4b12b0d2f
The phylink conflict was between a bug fix by Russell King
to make sure we have a consistent PHY interface mode, and
a change in net-next to pull some code in phylink_resolve()
into the helper functions phylink_mac_link_{up,down}()
On the dp83867 side it's mostly overlapping changes, with
the 'net' side removing a condition that was supposed to
trigger for RGMII but because of how it was coded never
actually could trigger.
Signed-off-by: David S. Miller <davem@davemloft.net>
66 lines
1.8 KiB
C
66 lines
1.8 KiB
C
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
/* SCTP kernel reference Implementation
|
|
* Copyright (c) 1999-2001 Motorola, Inc.
|
|
* Copyright (c) 2001-2003 International Business Machines, Corp.
|
|
*
|
|
* This file is part of the SCTP kernel reference Implementation
|
|
*
|
|
* SCTP Checksum functions
|
|
*
|
|
* Please send any bug reports or fixes you make to the
|
|
* email address(es):
|
|
* lksctp developers <linux-sctp@vger.kernel.org>
|
|
*
|
|
* Written or modified by:
|
|
* Dinakaran Joseph
|
|
* Jon Grimm <jgrimm@us.ibm.com>
|
|
* Sridhar Samudrala <sri@us.ibm.com>
|
|
*
|
|
* Rewritten to use libcrc32c by:
|
|
* Vlad Yasevich <vladislav.yasevich@hp.com>
|
|
*/
|
|
|
|
#ifndef __sctp_checksum_h__
|
|
#define __sctp_checksum_h__
|
|
|
|
#include <linux/types.h>
|
|
#include <net/sctp/sctp.h>
|
|
#include <linux/crc32c.h>
|
|
#include <linux/crc32.h>
|
|
|
|
static inline __wsum sctp_csum_update(const void *buff, int len, __wsum sum)
|
|
{
|
|
/* This uses the crypto implementation of crc32c, which is either
|
|
* implemented w/ hardware support or resolves to __crc32c_le().
|
|
*/
|
|
return (__force __wsum)crc32c((__force __u32)sum, buff, len);
|
|
}
|
|
|
|
static inline __wsum sctp_csum_combine(__wsum csum, __wsum csum2,
|
|
int offset, int len)
|
|
{
|
|
return (__force __wsum)__crc32c_le_combine((__force __u32)csum,
|
|
(__force __u32)csum2, len);
|
|
}
|
|
|
|
static const struct skb_checksum_ops sctp_csum_ops = {
|
|
.update = sctp_csum_update,
|
|
.combine = sctp_csum_combine,
|
|
};
|
|
|
|
static inline __le32 sctp_compute_cksum(const struct sk_buff *skb,
|
|
unsigned int offset)
|
|
{
|
|
struct sctphdr *sh = (struct sctphdr *)(skb->data + offset);
|
|
__le32 old = sh->checksum;
|
|
__wsum new;
|
|
|
|
sh->checksum = 0;
|
|
new = ~__skb_checksum(skb, offset, skb->len - offset, ~(__wsum)0,
|
|
&sctp_csum_ops);
|
|
sh->checksum = old;
|
|
|
|
return cpu_to_le32((__force __u32)new);
|
|
}
|
|
|
|
#endif /* __sctp_checksum_h__ */
|