diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2025-09-08 17:12:46 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2025-09-08 17:12:46 -0300 |
| commit | c1ead4b4dfe0f643cfc66571ca7d2fa332eddd35 (patch) | |
| tree | a22ad44bdcc8ea38401cc129e75f15fb4c533317 /include/linux/atmdev.h | |
| parent | 75a7b9d29215c5aa813b9620f3c56817918f9f8c (diff) | |
| parent | f777d1112ee597d7f7dd3ca232220873a34ad0c8 (diff) | |
Merge remote-tracking branch 'torvalds/master' into perf-tools-next
To pick the fixes sent by Namhyung for tools/perf for v6.17-rc5 and get
closer to the other tools code that is used by tools/perf.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'include/linux/atmdev.h')
| -rw-r--r-- | include/linux/atmdev.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h index 45f2f278b50a..70807c679f1a 100644 --- a/include/linux/atmdev.h +++ b/include/linux/atmdev.h @@ -185,6 +185,7 @@ struct atmdev_ops { /* only send is required */ int (*compat_ioctl)(struct atm_dev *dev,unsigned int cmd, void __user *arg); #endif + int (*pre_send)(struct atm_vcc *vcc, struct sk_buff *skb); int (*send)(struct atm_vcc *vcc,struct sk_buff *skb); int (*send_bh)(struct atm_vcc *vcc, struct sk_buff *skb); int (*send_oam)(struct atm_vcc *vcc,void *cell,int flags); |