diff options
| author | David S. Miller <davem@davemloft.net> | 2015-03-09 15:41:00 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-09 15:41:00 -0400 |
| commit | d03725044a2a75090d1b5b46ed5d87945d2d0116 (patch) | |
| tree | 16d1db41b66bd4f8ca6f95d06a9a819534dcaeb3 /net | |
| parent | c247f0534cc5a5a547a343903f42295a471844e2 (diff) | |
| parent | f7214cf29ca6c977ad2c428f2b832e9c66f2ee1b (diff) | |
| download | blackbird-op-linux-d03725044a2a75090d1b5b46ed5d87945d2d0116.tar.gz blackbird-op-linux-d03725044a2a75090d1b5b46ed5d87945d2d0116.zip | |
Merge tag 'linux-can-fixes-for-4.0-20150309' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2015-03-09
this is a pull request for net/master for the 4.0 release cycle, it consists of
6 patches:
A patch by Oliver Hartkopp fixes a long outstanding bug in the infrastructure,
which leads to skb_under_panics when CAN interfaces are used by AF_PACKET
sockets e.g. by dhclient. Stephane Grosjean contributes a patch for the
peak_usb driver which adds a missing initialization. Two patches by Ahmed S.
Darwish fix problems in the kvaser_usb driver. Followed by two patches by
myself, updating the MAINTAINERS file
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/can/af_can.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/can/af_can.c b/net/can/af_can.c index 66e08040ced7..32d710eaf1fc 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c @@ -259,6 +259,9 @@ int can_send(struct sk_buff *skb, int loop) goto inval_skb; } + skb->ip_summed = CHECKSUM_UNNECESSARY; + + skb_reset_mac_header(skb); skb_reset_network_header(skb); skb_reset_transport_header(skb); |
