mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 00:40:03 +00:00
ccd8a9351f
The functions can_dropped_invalid_skb() and can_skb_headroom_valid() grew a lot over the years to a point which it does not make much sense to have them defined as static inline in header files. Move those two functions to the .c counterpart of skb.h. can_skb_headroom_valid()'s only caller being can_dropped_invalid_skb(), the declaration is removed from the header. Only can_dropped_invalid_skb() gets its symbol exported. While doing so, do a small cleanup: add brackets around the else block in can_dropped_invalid_skb(). Link: https://lore.kernel.org/all/20220610143009.323579-7-mailhol.vincent@wanadoo.fr Signed-off-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr> Reported-by: kernel test robot <lkp@intel.com> Acked-by: Max Staudt <max@enpas.org> Tested-by: Oliver Hartkopp <socketcan@hartkopp.net> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
106 lines
3.1 KiB
C
106 lines
3.1 KiB
C
/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
|
|
/*
|
|
* linux/can/skb.h
|
|
*
|
|
* Definitions for the CAN network socket buffer
|
|
*
|
|
* Copyright (C) 2012 Oliver Hartkopp <socketcan@hartkopp.net>
|
|
*
|
|
*/
|
|
|
|
#ifndef _CAN_SKB_H
|
|
#define _CAN_SKB_H
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/skbuff.h>
|
|
#include <linux/can.h>
|
|
#include <net/sock.h>
|
|
|
|
void can_flush_echo_skb(struct net_device *dev);
|
|
int can_put_echo_skb(struct sk_buff *skb, struct net_device *dev,
|
|
unsigned int idx, unsigned int frame_len);
|
|
struct sk_buff *__can_get_echo_skb(struct net_device *dev, unsigned int idx,
|
|
u8 *len_ptr, unsigned int *frame_len_ptr);
|
|
unsigned int __must_check can_get_echo_skb(struct net_device *dev,
|
|
unsigned int idx,
|
|
unsigned int *frame_len_ptr);
|
|
void can_free_echo_skb(struct net_device *dev, unsigned int idx,
|
|
unsigned int *frame_len_ptr);
|
|
struct sk_buff *alloc_can_skb(struct net_device *dev, struct can_frame **cf);
|
|
struct sk_buff *alloc_canfd_skb(struct net_device *dev,
|
|
struct canfd_frame **cfd);
|
|
struct sk_buff *alloc_can_err_skb(struct net_device *dev,
|
|
struct can_frame **cf);
|
|
bool can_dropped_invalid_skb(struct net_device *dev, struct sk_buff *skb);
|
|
|
|
/*
|
|
* The struct can_skb_priv is used to transport additional information along
|
|
* with the stored struct can(fd)_frame that can not be contained in existing
|
|
* struct sk_buff elements.
|
|
* N.B. that this information must not be modified in cloned CAN sk_buffs.
|
|
* To modify the CAN frame content or the struct can_skb_priv content
|
|
* skb_copy() needs to be used instead of skb_clone().
|
|
*/
|
|
|
|
/**
|
|
* struct can_skb_priv - private additional data inside CAN sk_buffs
|
|
* @ifindex: ifindex of the first interface the CAN frame appeared on
|
|
* @skbcnt: atomic counter to have an unique id together with skb pointer
|
|
* @frame_len: length of CAN frame in data link layer
|
|
* @cf: align to the following CAN frame at skb->data
|
|
*/
|
|
struct can_skb_priv {
|
|
int ifindex;
|
|
int skbcnt;
|
|
unsigned int frame_len;
|
|
struct can_frame cf[];
|
|
};
|
|
|
|
static inline struct can_skb_priv *can_skb_prv(struct sk_buff *skb)
|
|
{
|
|
return (struct can_skb_priv *)(skb->head);
|
|
}
|
|
|
|
static inline void can_skb_reserve(struct sk_buff *skb)
|
|
{
|
|
skb_reserve(skb, sizeof(struct can_skb_priv));
|
|
}
|
|
|
|
static inline void can_skb_set_owner(struct sk_buff *skb, struct sock *sk)
|
|
{
|
|
/* If the socket has already been closed by user space, the
|
|
* refcount may already be 0 (and the socket will be freed
|
|
* after the last TX skb has been freed). So only increase
|
|
* socket refcount if the refcount is > 0.
|
|
*/
|
|
if (sk && refcount_inc_not_zero(&sk->sk_refcnt)) {
|
|
skb->destructor = sock_efree;
|
|
skb->sk = sk;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* returns an unshared skb owned by the original sock to be echo'ed back
|
|
*/
|
|
static inline struct sk_buff *can_create_echo_skb(struct sk_buff *skb)
|
|
{
|
|
struct sk_buff *nskb;
|
|
|
|
nskb = skb_clone(skb, GFP_ATOMIC);
|
|
if (unlikely(!nskb)) {
|
|
kfree_skb(skb);
|
|
return NULL;
|
|
}
|
|
|
|
can_skb_set_owner(nskb, skb->sk);
|
|
consume_skb(skb);
|
|
return nskb;
|
|
}
|
|
|
|
static inline bool can_is_canfd_skb(const struct sk_buff *skb)
|
|
{
|
|
/* the CAN specific type of skb is identified by its data length */
|
|
return skb->len == CANFD_MTU;
|
|
}
|
|
|
|
#endif /* !_CAN_SKB_H */
|